Merge branch 'master' of git://git.esilibrary.com/git/evergreen-equinox
authorDan Scott <gitorious@coffeecode.net>
Tue, 5 Apr 2011 02:03:26 +0000 (22:03 -0400)
committerDan Scott <gitorious@coffeecode.net>
Tue, 5 Apr 2011 02:03:26 +0000 (22:03 -0400)

Trivial merge