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)
commit4552224dc556037a45406e75b9c4bdc7bafd2199
treece37d0710a7f05d12389140e2260b673afbc2d4a
parentf0061858ec3c9151fe4b20e390678093ea8f32df
parent3a6ba954ebdea9e36de8c8fd12f2b4f78527de6f
Merge branch 'master' into p2p