Merge commit 'vudentz/master'
authorLennart Poettering <lennart@poettering.net>
Mon, 6 Oct 2008 00:28:17 +0000 (02:28 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 6 Oct 2008 00:28:17 +0000 (02:28 +0200)
commitf64d6af0b70a85e2a825023956c893cc886b0042
tree8450ef182dbf4b8922b44094f17b076dd911c6a5
parentaa4373962cef6c00b16e229ff6165c144d322ccb
parentfef63d77b4eed2562e94735399716cb99d8b22cc
Merge commit 'vudentz/master'