Merge branch 'master' into missing
authorDan Vanderkam <danvdk@gmail.com>
Sat, 28 Nov 2009 15:15:41 +0000 (10:15 -0500)
committerDan Vanderkam <danvdk@gmail.com>
Sat, 28 Nov 2009 15:15:41 +0000 (10:15 -0500)

Trivial merge