[SCM] jenkins-json packaging branch, master, updated. debian/2.1-rev6-1-5-g1d52f78

[James Page]

The following commit has been merged in the master branch:
commit 2caabc9d318c4688222cf4ef9ef5a95802b9a172
Merge: 8ad034ce4112504d5a400177d1cf2b23f264a844 e4f6dc8e9cb8f26e1e70ee69c3220d2752c9d10e
Author: James Page <james.page at canonical.com>
Date:   Fri Oct 21 22:47:35 2011 +0100

    Merge commit 'upstream/2.1-rev7'


-- 
jenkins-json packaging