Merge branch 'master' into master-tx
authorLennart Poettering <lennart@poettering.net>
Mon, 27 Jul 2009 23:35:19 +0000 (01:35 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 27 Jul 2009 23:35:19 +0000 (01:35 +0200)
commit09e57c2ee9c731805e97f07771a18dfc4c917318
treeef48805839f8bede8accef8c1eed47ef6a9e3372
parent835a2ae83a6cca344608ce9504f8d69da9d112fc
parent8343360da1d8d93e8e3818ab91e7f764a1c8c99e
Merge branch 'master' into master-tx