Merge branch 'master' of git://github.com/openlibrary/bookreader
authorscollett <stephanie.collett@ucop.edu>
Fri, 13 Nov 2009 23:51:13 +0000 (15:51 -0800)
committerscollett <stephanie.collett@ucop.edu>
Fri, 13 Nov 2009 23:51:13 +0000 (15:51 -0800)

Trivial merge