Merge branch 'master' of git.evergreen-ils.org:Evergreen
authorMike Rylander <mrylander@gmail.com>
Mon, 30 Jul 2012 19:08:47 +0000 (15:08 -0400)
committerMike Rylander <mrylander@gmail.com>
Mon, 30 Jul 2012 19:09:29 +0000 (15:09 -0400)
Appologies for the merge commit noise...

Signed-off-by: Mike Rylander <mrylander@gmail.com>

Trivial merge