Merge branch 'master' of git://git.esilibrary.com/git/evergreen-equinox
authorDan Scott <gitorious@coffeecode.net>
Wed, 30 Mar 2011 00:58:31 +0000 (20:58 -0400)
committerDan Scott <gitorious@coffeecode.net>
Wed, 30 Mar 2011 00:58:31 +0000 (20:58 -0400)

Trivial merge