Merge branch 'newprototype' into prototype-1.7
authorMichael M Slusarz <slusarz@curecanti.org>
Wed, 30 Jun 2010 17:46:46 +0000 (11:46 -0600)
committerMichael M Slusarz <slusarz@curecanti.org>
Wed, 30 Jun 2010 17:46:46 +0000 (11:46 -0600)

Trivial merge