Merge branch 'eg26'
authorJeff Davis <jdavis@sitka.bclibraries.ca>
Wed, 16 Jul 2014 19:40:48 +0000 (12:40 -0700)
committerJeff Davis <jdavis@sitka.bclibraries.ca>
Wed, 16 Jul 2014 19:40:48 +0000 (12:40 -0700)

Trivial merge