Merge commit 'origin/master-tx'
authorLennart Poettering <lennart@poettering.net>
Wed, 17 Jun 2009 21:41:46 +0000 (23:41 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 17 Jun 2009 21:41:46 +0000 (23:41 +0200)
commitf1ef2f606f027959f71a13c5dc1d795756fda33a
tree87bc32d0e83d8a9018fb10a7d308ae4a8ccf1f89
parent75256fb671b6ae8d784e0d6415d292fdbc6482c2
parent550b619558f03fb9e6d5d8072b9a4b15d9e6f91f
Merge commit 'origin/master-tx'