merge patched into master

diff --cc debian/.git-dpm
index 4d227820ec4f31a6cc7fbe7d6047181f8f26eb16,0000000000000000000000000000000000000000..28b6c1eeaeb71bec4647fd79dc453a4ac85f8b62
mode 100644,000000..100644
--- 1/debian/.git-dpm
--- /dev/null
+++ b/debian/.git-dpm
@@@ -1,9 -1,0 +1,9 @@@
- dbcbb3e5b9fac665b92d630eb24de7bd8c43652e
 +# see git-dpm(1) from git-dpm package
 +dbcbb3e5b9fac665b92d630eb24de7bd8c43652e
++589500ad3777d1335c8e5cb139f7c0c6089112a8
 +21f954425ffe2a934b6b26c0c948d340c91a16bb
 +21f954425ffe2a934b6b26c0c948d340c91a16bb
 +grub2_2.06.orig.tar.xz
 +c9f93f1e195ec7a5a21d36a13b469788c0b29f0f
 +6581924
 +signature:910db38472f2d654a4816a0c3b7b83415502850f:833:grub2_2.06.orig.tar.xz.asc