Merge remote branch 'origin/master-tx' into 0.9.19-stable
commit5471643b781768ee54f6b6bf12947b793d658b9b
authorLennart Poettering <lennart@poettering.net>
Wed, 11 Nov 2009 04:37:28 +0000 (11 05:37 +0100)
committerLennart Poettering <lennart@poettering.net>
Wed, 11 Nov 2009 04:37:28 +0000 (11 05:37 +0100)
treeae47a6a1b03b86f60fae5515be33abaae2146d7a
parentde2654c4e409e3bde1e971512bb0b7e587cbed10
parentecaf9718c450a0e0e71ecf3cab42cb3bbc447f6f
Merge remote branch 'origin/master-tx' into 0.9.19-stable