Merge branch 'read_aloud' of git@github.com:openlibrary/bookreader into read_aloud
authorrajbot <raj@archive.org>
Thu, 30 Sep 2010 06:05:33 +0000 (06:05 +0000)
committerrajbot <raj@archive.org>
Thu, 30 Sep 2010 06:05:33 +0000 (06:05 +0000)
commitdc840d9298adaed3f07ec3418e7e9038584849fe
tree96e4e1ffee9b63ad0bb121c8178b1699ba6ee39d
parentd1e690ada4709a4775b161a28c9283fa0902cd27
parent1ff9e1a1dcec864763b3a66744f5c100acaf9e48
Merge branch 'read_aloud' of git@github.com:openlibrary/bookreader into read_aloud

Conflicts:
BookReaderIA/datanode/BookReaderGetText.py
BookReaderIA/datanode/BookReaderGetText.py