Merge branch 'launchpad-333386' into release
authorLen Brown <[email protected]>
Thu, 15 Oct 2009 04:46:57 +0000 (00:46 -0400)
committerLen Brown <[email protected]>
Thu, 15 Oct 2009 04:46:57 +0000 (00:46 -0400)

Trivial merge