Merge commit 'origin/master-tx'
authorLennart Poettering <lennart@poettering.net>
Fri, 20 Feb 2009 02:24:27 +0000 (03:24 +0100)
committerLennart Poettering <lennart@poettering.net>
Fri, 20 Feb 2009 02:24:27 +0000 (03:24 +0100)
commit3da3ea2678d4107bd87d1a466464a0bf4682236f
tree72a4d71160988967aa555619404fac40ea8cce21
parent7bc1847596bdedea6a06c8c0a019da773476a965
parentaae5b15ef7a7a910dd9b8ad77a66dad56a35c4ac
Merge commit 'origin/master-tx'