Merge commit 'origin/master-tx'
authorLennart Poettering <lennart@poettering.net>
Mon, 23 Mar 2009 15:32:03 +0000 (16:32 +0100)
committerLennart Poettering <lennart@poettering.net>
Mon, 23 Mar 2009 15:32:03 +0000 (16:32 +0100)
commit906fd570c71677dca9f1c12366b009d9a0b95e1a
tree02030b76fe87ceb19058f3d3092f3a87538c5762
parentc14da67050d3d1b5add80aee3712aa883cc4405b
parent4c381cd7b4889b9dce361922fc1624648efe5dd6
Merge commit 'origin/master-tx'