Merge commit 'remotes/meins/master'
authorAndre Noll <maan@systemlinux.org>
Mon, 14 Jan 2008 09:15:39 +0000 (10:15 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 14 Jan 2008 09:15:39 +0000 (10:15 +0100)
commitb88a9a0cbbb39e999ae4942ed596b17ce2ae7f23
tree87ad8d65e79f836c22101864c9a89eb9cc066528
parentde0de594e7a11f636d31e5a99be700fa1bcb1483
parent48197733abe1f0ecf684085602fb5d5ea44a8a9d
Merge commit 'remotes/meins/master'