Merge commit 'origin/master-tx'
authorLennart Poettering <lennart@poettering.net>
Thu, 19 Mar 2009 16:48:10 +0000 (17:48 +0100)
committerLennart Poettering <lennart@poettering.net>
Thu, 19 Mar 2009 16:48:10 +0000 (17:48 +0100)
commit86439a4613d70bbc04bebb788486205d23f79baf
treed4adbed71e24af051e3bf0be87fc58b66f54793b
parent0a1af8eb59cd8c600803ca57a2be29dc927df882
parent000f0b84d9c999fba83d5d67cf39628dafd23a2e
Merge commit 'origin/master-tx'