bringing the branch up to trunk
authorJosh Karlin <jkarlin@bbn.com>
Wed, 3 Mar 2010 18:55:07 +0000 (18:55 +0000)
committerJosh Karlin <jkarlin@bbn.com>
Wed, 3 Mar 2010 18:55:07 +0000 (18:55 +0000)

Trivial merge