Merge remote branch 'origin/master-tx'
authorLennart Poettering <lennart@poettering.net>
Sat, 19 Sep 2009 00:35:13 +0000 (02:35 +0200)
committerLennart Poettering <lennart@poettering.net>
Sat, 19 Sep 2009 00:35:13 +0000 (02:35 +0200)
commit33b45cd72aa356a9f522af417467f6d3d7863523
tree50a5eb091a4a5e65b5b492ca6a35907a59912bde
parent6c0317dbdf32794d29463e7559e6fb7bd57da8b3
parente141ddcad4fd7a250a0fa5b8578f35f6a7e37a89
Merge remote branch 'origin/master-tx'