Merge remote-tracking branch 'eg-working/user/senator/tpac-bookbag-viewer'
authorMike Rylander <mrylander@gmail.com>
Tue, 10 Jan 2012 19:26:50 +0000 (14:26 -0500)
committerMike Rylander <mrylander@gmail.com>
Tue, 10 Jan 2012 19:26:50 +0000 (14:26 -0500)

Trivial merge