Merge remote branch 'tanuk/fixes'
authorLennart Poettering <lennart@poettering.net>
Wed, 13 Jan 2010 20:33:11 +0000 (21:33 +0100)
committerLennart Poettering <lennart@poettering.net>
Wed, 13 Jan 2010 20:33:11 +0000 (21:33 +0100)
1  2 
src/Makefile.am

diff --cc src/Makefile.am
Simple merge