merged from master

diff --cc kernel_build.py
index e6f5de7c724047bb5997cff3c3160ca9264e38da,682f9a32d2912e3b9d4a1c93ecf36d42e1623c67..fb5e7a97b6a112c2df4157c9e19822f180c06552
--- 1/kernel_build.py
--- 2/kernel_build.py
+++ b/kernel_build.py
@@@ -128,7 -131,7 +131,7 @@@ def build_kernel_with_pbuilder(revision
              PBUILDER,
              '--execute',
              '--hookdir', '""',
-             '--bindmounts', '"%s"' %(CWD),
 -            '--bindmounts', '"/srv/git"',
++            '--bindmounts', '"/srv/git %s"' %(CWD),
              '--',
              pbuilder_script,
              '--cwd', '%s' %('/tmp'),

diff --cc kernel_inpbuilder.py
Simple merge