Merge branch 'mika/efi'
authorMichael Prokop <mika@grml.org>
Tue, 29 Nov 2011 10:23:43 +0000 (11:23 +0100)
committerMichael Prokop <mika@grml.org>
Tue, 29 Nov 2011 10:23:43 +0000 (11:23 +0100)

Trivial merge