Merge branch 'master' of git://git.esilibrary.com/git/evergreen-equinox
authorDan Scott <gitorious@coffeecode.net>
Mon, 11 Apr 2011 17:48:36 +0000 (13:48 -0400)
committerDan Scott <gitorious@coffeecode.net>
Mon, 11 Apr 2011 17:48:36 +0000 (13:48 -0400)

Trivial merge