Merge commit 'lance/newui' into newui

author Michael Ang <mang@archive.org>

Mon, 18 Oct 2010 22:21:34 +0000 (22:21 +0000)

committer Michael Ang <mang@archive.org>

Mon, 18 Oct 2010 22:21:34 +0000 (22:21 +0000)
author Michael Ang <mang@archive.org>
Mon, 18 Oct 2010 22:21:34 +0000 (22:21 +0000)
committer Michael Ang <mang@archive.org>
Mon, 18 Oct 2010 22:21:34 +0000 (22:21 +0000)
diff --cc BookReader/BookReader.css
Simple merge
diff --cc BookReader/BookReader.js
Simple merge
author	Michael Ang <mang@archive.org>
	Mon, 18 Oct 2010 22:21:34 +0000 (22:21 +0000)
committer	Michael Ang <mang@archive.org>
	Mon, 18 Oct 2010 22:21:34 +0000 (22:21 +0000)
		1	2
BookReader/BookReader.css	patch \|	diff1 \|	diff2 \|	blob \| history
BookReader/BookReader.js	patch \|	diff1 \|	diff2 \|	blob \| history