Merge commit 'origin/master-tx'
commitaaf0d5ae35d3212be3b233c49be541cd8b1465ce
authorLennart Poettering <lennart@poettering.net>
Fri, 21 Aug 2009 22:08:33 +0000 (22 00:08 +0200)
committerLennart Poettering <lennart@poettering.net>
Fri, 21 Aug 2009 22:08:33 +0000 (22 00:08 +0200)
treeb4e0714b32177c1ceef71f4c3a172b81dda1e142
parentde19bdd34e54c6a4fe8791d28ce0733343381488
parentc5d78605fe76bb6f0acd8aca1de1fff38fb9ddfc
Merge commit 'origin/master-tx'