Copying trunk version 18639 into a geni branch
authorJosh Karlin <jkarlin@bbn.com>
Wed, 18 Aug 2010 16:21:03 +0000 (16:21 +0000)
committerJosh Karlin <jkarlin@bbn.com>
Wed, 18 Aug 2010 16:21:03 +0000 (16:21 +0000)

Trivial merge