Merge remote branch 'origin/new/bug_10018_10061_deb_pkg_fixes'
authorGalen Charlton <gmc@esilibrary.com>
Tue, 16 Apr 2013 15:16:26 +0000 (08:16 -0700)
committerGalen Charlton <gmc@esilibrary.com>
Tue, 16 Apr 2013 15:16:26 +0000 (08:16 -0700)

Trivial merge