[SCM] Apache ZooKeeper branch, master, updated. debian/3.3.4+dfsg1-2-5-g954cd54

[James Page]

The following commit has been merged in the master branch:
commit 954cd5496cacfe86cbb06e1cb2155c6ccf61c064
Merge: 6f1f407b4f59763401f3e0c5eeac27d5f4915313 fecdc36a2083130af022046c6048feec7dfbcd8d
Author: James Page <james.page at ubuntu.com>
Date:   Mon Jan 30 19:30:55 2012 +0000

    Merge commit 'upstream/3.3.4+dfsg1'


-- 
Apache ZooKeeper