Merge branch 'master' of git://git.esilibrary.com/git/evergreen-equinox
authorDan Scott <gitorious@coffeecode.net>
Fri, 8 Apr 2011 18:05:44 +0000 (14:05 -0400)
committerDan Scott <gitorious@coffeecode.net>
Fri, 8 Apr 2011 18:05:44 +0000 (14:05 -0400)

Trivial merge