Merge branch 'master' of git://github.com/openlibrary/bookreader
authorscollett <stephanie.collett@ucop.edu>
Tue, 15 Sep 2009 19:35:26 +0000 (12:35 -0700)
committerscollett <stephanie.collett@ucop.edu>
Tue, 15 Sep 2009 19:35:26 +0000 (12:35 -0700)

Trivial merge