Merge commit 'meins/master'
authorAndre Noll <maan@systemlinux.org>
Tue, 25 May 2010 07:23:44 +0000 (09:23 +0200)
committerAndre Noll <maan@systemlinux.org>
Tue, 25 May 2010 07:23:44 +0000 (09:23 +0200)
commit80ce39491e340c83d05c2fa433f5033bd7bd80d4
tree81f3a656d36c861c1c76de99e7d458f9278de31d
parent64304d6ac539be6aa08d2f022b69f60089dee7ce
parent04d57a4d05ce0a0f8d16c32d14d056e312527808
Merge commit 'meins/master'