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)
commitdb5741b5b41210da401504a3493d9a284da32e9c
tree48ff90cc4a08a08b661c14f75012023aeff4d92e
parent6d2573a03f822bd0f7423215948ffb73af9d9b9b
parent17e7145abf34730eff02a38246213f018e4dd265
Merge branch 'mika/efi'