# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1225200254 0
# Node ID c562f221a0e985aafe3af62e59faa390d91b36d1
# Parent  e54d7fff1ad2635adb97ff3ac266da5d2ea1dbb0# Parent  4490b3002b89e77ea208e28649187a46607f7998
merge of 'dcede21c9852ddddc60076539bfdb8d7e226df33'
     and 'e15ae03551529f08eedcd38fa27b03fc4812bae8'

diff -r 4490b3002b89 -r c562f221a0e9 Makefile.am