Merge branch 'mgorse' into socketplug
authorMike Gorse <mgorse@novell.com>
Tue, 10 Nov 2009 15:36:23 +0000 (10:36 -0500)
committerMike Gorse <mgorse@novell.com>
Tue, 10 Nov 2009 15:36:23 +0000 (10:36 -0500)

Trivial merge