Merge branch 'master' into mgorse
authorMike Gorse <mgorse@novell.com>
Tue, 10 Nov 2009 22:26:50 +0000 (17:26 -0500)
committerMike Gorse <mgorse@novell.com>
Tue, 10 Nov 2009 22:26:50 +0000 (17:26 -0500)

Trivial merge