Merge commit '38ded3bb31bc49664641965f856a35f432a8a956'
authorLennart Poettering <lennart@poettering.net>
Thu, 19 Feb 2009 04:17:08 +0000 (05:17 +0100)
committerLennart Poettering <lennart@poettering.net>
Thu, 19 Feb 2009 04:17:08 +0000 (05:17 +0100)
commit2e250aaebb7708b25b5342d8ced657364adedc95
tree5698b90b843d0678350b9ab51d8c4d4d795dc12e
parentb0c0106824b47e7b21f022cb0f8dbf5b54a7b269
parent38ded3bb31bc49664641965f856a35f432a8a956
Merge commit '38ded3bb31bc49664641965f856a35f432a8a956'