Merge branch 'new-world-order'
authorLennart Poettering <lennart@poettering.net>
Fri, 24 Oct 2008 23:23:02 +0000 (01:23 +0200)
committerLennart Poettering <lennart@poettering.net>
Fri, 24 Oct 2008 23:23:02 +0000 (01:23 +0200)
Conflicts:
src/Makefile.am

1  2 
src/Makefile.am

diff --cc src/Makefile.am
Simple merge