Merge commit 'origin/master-tx'
authorLennart Poettering <lennart@poettering.net>
Thu, 8 Jan 2009 18:35:58 +0000 (19:35 +0100)
committerLennart Poettering <lennart@poettering.net>
Thu, 8 Jan 2009 18:35:58 +0000 (19:35 +0100)
commit6b9056c61a174cd8fa085f85afa60f4e4ef3b5ed
treed136723732a31ec598b49f910f2c1ec669714e46
parenta1a1119afe6647099f69d7ae95de9f34b766fa75
parent17ae579cc77c88dfc7bcf2b2c72e6678e91f28a5
Merge commit 'origin/master-tx'