patch 3

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
patch 4

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>