[SCM] stapler packaging branch, master, updated. upstream/1.167-8-g3f8fda7

[James Page]

The following commit has been merged in the master branch:
commit 3dfa86486fd66ac591ceb38e29da01c50364ea72
Merge: 8ef279c4384570d6b26b419d092a75d103ac78cb f65726e4607dd90371c2a35469fb66d0605c3ae1
Author: James Page <james.page at canonical.com>
Date:   Thu Sep 29 10:12:54 2011 +0100

    Merge commit 'upstream/1.174'


-- 
stapler packaging