Merge branch 'newui' of http://github.com/rajbot/bookreader into swipe

author Michael Ang <mang@archive.org>

Tue, 19 Oct 2010 20:40:35 +0000 (20:40 +0000)

committer Michael Ang <mang@archive.org>

Tue, 19 Oct 2010 20:40:35 +0000 (20:40 +0000)
author Michael Ang <mang@archive.org>
Tue, 19 Oct 2010 20:40:35 +0000 (20:40 +0000)
committer Michael Ang <mang@archive.org>
Tue, 19 Oct 2010 20:40:35 +0000 (20:40 +0000)
diff --cc BookReader/BookReader.css
Simple merge
diff --cc BookReader/BookReader.js
Simple merge
author	Michael Ang <mang@archive.org>
	Tue, 19 Oct 2010 20:40:35 +0000 (20:40 +0000)
committer	Michael Ang <mang@archive.org>
	Tue, 19 Oct 2010 20:40:35 +0000 (20:40 +0000)
		1	2
BookReader/BookReader.css	patch \|	diff1 \|	diff2 \|	blob \| history
BookReader/BookReader.js	patch \|	diff1 \|	diff2 \|	blob \| history