Merge remote branch 'origin/master'
authorLennart Poettering <lennart@poettering.net>
Thu, 29 Oct 2009 00:54:45 +0000 (01:54 +0100)
committerLennart Poettering <lennart@poettering.net>
Thu, 29 Oct 2009 00:54:45 +0000 (01:54 +0100)
commit754644fa6e1ec83dba85bf586a2b09c2283aa096
tree27b464013d48b86ce8daba6adb6d925369c50ea0
parente7e4e4459e6dad888d1f9a01d0b185221e1a120e
parente9ccc61a2f561c37939e34a192bd7bd953eb8cbc
Merge remote branch 'origin/master'