Merge commit 'origin/master-tx'
authorLennart Poettering <lennart@poettering.net>
Mon, 24 Aug 2009 01:31:03 +0000 (03:31 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 24 Aug 2009 01:31:03 +0000 (03:31 +0200)
commit60a350209ded62b9c2d1d948d3e71d2982477566
treeb10c9e95dfc228561fc97bfe1ad3ddb3ba1fdbae
parent050a3a99e1d151b4f55c89f82073ef33f3399646
parent57117d4ab75ec858bfa0468d0da0b1465813b4c9
Merge commit 'origin/master-tx'