Merge commit 'origin/master'
authorLennart Poettering <lennart@poettering.net>
Mon, 30 Mar 2009 17:14:09 +0000 (19:14 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 30 Mar 2009 17:14:09 +0000 (19:14 +0200)
commit061344fbd78f4a643f4e2a12b24c5d1ae1622e04
tree4c2d29990e9a6b0bc638bcc381ce8bf0c29aaacb
parentaa6803653e513214fa1ab1d03ace5c91c5357a2b
parent87d63b19a3f35650536c3595cf89145d61a052ca
Merge commit 'origin/master'