Merge commit 'vudentz/master'
authorLennart Poettering <lennart@poettering.net>
Tue, 23 Dec 2008 17:31:12 +0000 (18:31 +0100)
committerLennart Poettering <lennart@poettering.net>
Tue, 23 Dec 2008 17:31:12 +0000 (18:31 +0100)
commitf24e4c19c33b534e5f15d6ae227d07ae7755e644
tree9150bd8f0e562c7248374899bed494cc23a0fa57
parentc2bd8dc517f825858e747343bd9fc3a88ac75776
parent7323e1a0a85cb61f92749d9ca88339cea0bfa9c7
Merge commit 'vudentz/master'