Merge branch 'master' into p2p
authorMike Gorse <mgorse@novell.com>
Wed, 29 Sep 2010 19:46:37 +0000 (15:46 -0400)
committerMike Gorse <mgorse@novell.com>
Wed, 29 Sep 2010 19:46:37 +0000 (15:46 -0400)

Trivial merge