Merge branch 'master' of git://git.esilibrary.com/git/evergreen-equinox
authorDan Scott <gitorious@coffeecode.net>
Thu, 7 Apr 2011 22:18:15 +0000 (18:18 -0400)
committerDan Scott <gitorious@coffeecode.net>
Thu, 7 Apr 2011 22:18:15 +0000 (18:18 -0400)

Trivial merge