Merge commit 'vudentz/master'
authorLennart Poettering <lennart@poettering.net>
Mon, 19 Jan 2009 22:12:23 +0000 (23:12 +0100)
committerLennart Poettering <lennart@poettering.net>
Mon, 19 Jan 2009 22:12:23 +0000 (23:12 +0100)
commitf83111dd1710d7e0a3240879217e6d0c783c4a4b
treea74bb6b974e8e0438ac38f94263cb9410b245f6c
parent96f01bf73fb8321f7dde732ab1b7ce52b5121043
parent4460a5d5d5015b003c703f3e81c00ad0ed3ac838
Merge commit 'vudentz/master'