Merge the cooper2 changes

[jonludlam]

This just adds tap-ctl stats bindings

[xen-git]

jonludlam/xen-api-libs@27aba7d ⇒ 3d850a1: Merge and build failed.

Failed when executing:
git merge 27aba7d
Error log:
Refreshing cookie to: 9cf7c0ebd50a99a1ecb23fc16f539f51c74e74da
======> 1336129922 filesystem-summarise: filesystem-summarise placed into myrepos
======> 1336129922 clone-xen-api.git: acquired /usr/local/builds/build-xen-git.hg/obj/repos/xen-api.git.lock
xen-api: cloning git
Cloning: git://hg.uk.xensource.com/carbon/trunk-ring3/xen-api.git to /usr/local/builds/build-xen-git.hg/obj/repos/xen-api
Cloning into '/usr/local/builds/build-xen-git.hg/obj/repos/xen-api'...
Refreshing cookie to: d9177d97605aba7a825087d4f0e6a3ddb3681358
======> 1336129927 api: xen-api placed into myrepos
======> 1336129928 clone-stunnel.git: acquired /usr/local/builds/build-xen-git.hg/obj/repos/stunnel.git.lock
stunnel: cloning git
Cloning: git://hg.uk.xensource.com/carbon/trunk-ring3/stunnel.git to /usr/local/builds/build-xen-git.hg/obj/repos/stunnel
Cloning into '/usr/local/builds/build-xen-git.hg/obj/repos/stunnel'...
Refreshing cookie to: ade86ff5d652d47a30240ce65e4142c2162d8677
======> 1336129928 stunnel: stunnel placed into myrepos
======> 1336129929 clone-xen-api-libs.git: acquired /usr/local/builds/build-xen-git.hg/obj/repos/xen-api-libs.git.lock
xen-api-libs: cloning git
Cloning: git://hg.uk.xensource.com/carbon/trunk-ring3/xen-api-libs.git to /usr/local/builds/build-xen-git.hg/obj/repos/xen-api-libs
Cloning into '/usr/local/builds/build-xen-git.hg/obj/repos/xen-api-libs'...
Refreshing cookie to: 3d850a1
======> 1336129929 api-libs: xen-api-libs placed into myrepos

[jonludlam]

pull-request-manager probably has a bug - it's trying to merge from my xen-api-libs rather than xen-org's. I'll manually merge this.