Merge branch 'master' of git://git.esilibrary.com/git/evergreen-equinox
authorDan Scott <gitorious@coffeecode.net>
Wed, 6 Apr 2011 03:33:00 +0000 (23:33 -0400)
committerDan Scott <gitorious@coffeecode.net>
Wed, 6 Apr 2011 03:33:00 +0000 (23:33 -0400)

Trivial merge