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)
commit1d978cea857a49710b28f6b906ee714ed6c5a492
tree1e55569c1479725beee2571b3c654b8c4650782b
parentb712e7b13dd6aed3e56eaee423ff071d6f0ce2c2
parentef0cc74567b3bb98378c17f6a523bf18ba132ed7
Merge branch 'new-world-order'

Conflicts:
src/Makefile.am
src/Makefile.am