Merge branch 'revert-lp954310'
authorBill Erickson <berick@esilibrary.com>
Mon, 2 Apr 2012 17:25:54 +0000 (13:25 -0400)
committerBill Erickson <berick@esilibrary.com>
Mon, 2 Apr 2012 17:25:57 +0000 (13:25 -0400)
Reverting commits from LP 954310, since the wrong branch was merged.

Signed-off-by: Bill Erickson <berick@esilibrary.com>

Trivial merge