Merge commit 'meins/master'
authorAndre Noll <maan@systemlinux.org>
Mon, 21 Dec 2009 10:45:02 +0000 (11:45 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 21 Dec 2009 10:45:02 +0000 (11:45 +0100)
commit8b8a81f7faf8faec7a14ebfca4ce2e5c6ad3ac40
tree7dd25f9871a43e5e058622f6d63e4e4ef7a09e95
parenteef8eae979b6acfe23eea809f4519510c7021015
parenta694ab16b6ff43b545ccd530360b7224433a5b76
Merge commit 'meins/master'