Merge branch 'master' of git://github.com/openlibrary/bookreader into thumbnail_feature
authorscollett <stephanie.collett@ucop.edu>
Mon, 14 Dec 2009 23:39:52 +0000 (15:39 -0800)
committerscollett <stephanie.collett@ucop.edu>
Mon, 14 Dec 2009 23:39:52 +0000 (15:39 -0800)
commitab34d470fef6dca2f1240c4507a690855ea71669
tree0bd86bdd387be8514975564da42d9181fd95236a
parente6c2d3b12f879e7de75d63d9550d2c29caa9ace5
parent54020ffd7ca5a20fa6755a188a583cb94b8a1e30
Merge branch 'master' of git://github.com/openlibrary/bookreader into thumbnail_feature

Conflicts:
BookReader/BookReader.css
BookReader/BookReader.js
BookReader/BookReader.css
BookReader/BookReader.js
BookReader/images/thumbnail_mode_icon.png