Merge branch 'master' of git://git.esilibrary.com/git/evergreen-equinox
authorDan Scott <gitorious@coffeecode.net>
Tue, 29 Mar 2011 15:01:17 +0000 (11:01 -0400)
committerDan Scott <gitorious@coffeecode.net>
Tue, 29 Mar 2011 15:01:17 +0000 (11:01 -0400)

Trivial merge