Merge branch 'gadget'
authorDan Vanderkam <danvdk@gmail.com>
Fri, 27 Nov 2009 02:31:10 +0000 (21:31 -0500)
committerDan Vanderkam <danvdk@gmail.com>
Fri, 27 Nov 2009 02:31:10 +0000 (21:31 -0500)

Trivial merge