Merge commit 'origin/master-tx'
authorLennart Poettering <lennart@poettering.net>
Tue, 24 Feb 2009 10:33:05 +0000 (11:33 +0100)
committerLennart Poettering <lennart@poettering.net>
Tue, 24 Feb 2009 10:33:05 +0000 (11:33 +0100)
commit364786ee8c16765da9c634f2293a152744cb2f85
treebcc788206c51a92218a3c680554fc98d0c1d4345
parent83148581830f6ed9740a6f82645d76c38e43a600
parentb063e53c9c93a7cee5fc2d12d438f905cca25b8d
Merge commit 'origin/master-tx'