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)
commit0048e28f72f43986719392255a055fbb7d6224dd
tree80e70d49177f39f564732a8740db5b8233a35948
parent83078472bfc64d9a6bb884a82db0a4db3dfd78b7
parentbf291d6842c0fb326c9fc0029d117b006ec46e44
Merge branch 'master' into mgorse