Merge remote-tracking branch 'boock/master'
authorAndre Noll <maan@systemlinux.org>
Wed, 2 Mar 2011 10:38:43 +0000 (11:38 +0100)
committerAndre Noll <maan@systemlinux.org>
Wed, 2 Mar 2011 10:38:43 +0000 (11:38 +0100)
commit7e37a7cf49df279b9ab467fa4f62dd376c791a26
tree6c67f572c0bc963b95d2988a1723d59b375a390f
parent02b4964346686a2e50f75d57a22b4cb209c259b9
parentfc81b02169c4817b45c5718cc333048042049e48
Merge remote-tracking branch 'boock/master'