Merge branch 'master' into gadget
authorDan Vanderkam <danvdk@gmail.com>
Fri, 27 Nov 2009 01:41:33 +0000 (20:41 -0500)
committerDan Vanderkam <danvdk@gmail.com>
Fri, 27 Nov 2009 01:41:33 +0000 (20:41 -0500)

Trivial merge