Squashed commit of the following:

commit 275d6e01
Merge: 42342905 319c7223
Author: Łukasz Nowak <luke@nexedi.com>
Date:   Thu Sep 8 15:20:10 2011 +0200

    Merge branch 'master' into suggested-improvements

    Conflicts:
    	slapos/recipe/build.py

commit 42342905
Author: Antoine Catton <acatton@tiolive.com>
Date:   Thu Sep 8 15:12:11 2011 +0200

    Minor: use shlex to parse patch options

commit 7994dcc8
Author: Antoine Catton <acatton@tiolive.com>
Date:   Thu Sep 8 15:11:21 2011 +0200

    Buxfix: the patch wasn't send in stdin

commit ee8f3249
Author: Antoine Catton <acatton@tiolive.com>
Date:   Thu Sep 8 12:04:22 2011 +0200

    Use shlex to split command line