Merge commit 'origin/master-tx'
authorLennart Poettering <lennart@poettering.net>
Wed, 28 Jan 2009 03:25:07 +0000 (04:25 +0100)
committerLennart Poettering <lennart@poettering.net>
Wed, 28 Jan 2009 03:25:07 +0000 (04:25 +0100)
commitf7c3ca7e9fb3af2ef0c97ba3964e856128496449
tree2b931fb7a0ad05d9431d03c7d320bc73032ab9f1
parentb56e0389d1ddf5dea496bf7c0536e1ce1e49b49e
parent085ca5f6d0a78d064e0bac7786ed52d5e7ccee1a
Merge commit 'origin/master-tx'