Fix merge conflicts
authorMichael Prokop <mika@grml.org>
Sun, 18 Oct 2009 22:48:30 +0000 (00:48 +0200)
committerMichael Prokop <mika@grml.org>
Sun, 18 Oct 2009 22:48:30 +0000 (00:48 +0200)
commitabe68338ee0a37eeaccb8dd45c4d9c0b1a18d4ca
tree85e0ac34cb9da5571676947c9ea2b803686473dd
parent579dda2838a24e1b71d11b9041264a8c3ecbbc82
parent428b5102a56be55e3d980103a4f0207c0f650ac8
Fix merge conflicts
grml2usb