Merge commit 'origin/master-tx'
authorLennart Poettering <lennart@poettering.net>
Tue, 3 Feb 2009 02:15:32 +0000 (03:15 +0100)
committerLennart Poettering <lennart@poettering.net>
Tue, 3 Feb 2009 02:15:32 +0000 (03:15 +0100)
commit273926184709423443831dc53b11c3cf68b0cdad
tree6e518c721b8ba2cff504171fc86073ddd653daee
parent08800c35b072820ba485a5a0a211ce91a1656390
parentdb2a4255aaf985128b3dccb84dd4e4f1be22a23f
Merge commit 'origin/master-tx'