Merge commit 'origin/jktest' into jktest3
authorJosh Karlin <jkarlin@bbn.com>
Thu, 7 Oct 2010 20:12:44 +0000 (16:12 -0400)
committerJosh Karlin <jkarlin@bbn.com>
Thu, 7 Oct 2010 20:12:44 +0000 (16:12 -0400)

Trivial merge