Merge remote-tracking branch 'origin/sitka_2_2' production-sitka_2_2-20120701
authorRobin H. Johnson <rjohnson@sitka.bclibraries.ca>
Sun, 1 Jul 2012 21:59:59 +0000 (21:59 +0000)
committerRobin H. Johnson <rjohnson@sitka.bclibraries.ca>
Sun, 1 Jul 2012 21:59:59 +0000 (21:59 +0000)

Trivial merge