Merge branch 'controlatsubmit'
authorDon Armstrong <don@donarmstrong.com>
Sat, 14 Jul 2012 22:53:45 +0000 (15:53 -0700)
committerDon Armstrong <don@donarmstrong.com>
Sat, 14 Jul 2012 22:53:45 +0000 (15:53 -0700)

Trivial merge