Merge branch 'master' of ssh://einstein/~/public_html/code/git/cookbook
authorW. Trevor King <wking@drexel.edu>
Wed, 21 Jul 2010 18:29:12 +0000 (14:29 -0400)
committerW. Trevor King <wking@drexel.edu>
Wed, 21 Jul 2010 18:29:12 +0000 (14:29 -0400)

Trivial merge