w7cook/OpenBook — pull request #215 by Di-Huynh (2012-04-23 15:08:32+00:00)
Title: Fixed some merge conflicts

* fixed the merge conflicts in rhsNav