Merge commit 'origin/master-tx'
authorLennart Poettering <lennart@poettering.net>
Tue, 21 Apr 2009 21:02:25 +0000 (23:02 +0200)
committerLennart Poettering <lennart@poettering.net>
Tue, 21 Apr 2009 21:02:25 +0000 (23:02 +0200)
commit69194243f0770b31e800e1681593e93f090388e7
tree134f99b7f5cd323b7951081149a0b383da6c344d
parent26383c6f1420ab80e8e7efcecbd75f70dfa96b55
parent3c36836bb7875b31b601ba8a0ae5eb029e16c909
Merge commit 'origin/master-tx'