Merge branches 'bugzilla-25412' and 'bugzilla-25302' into release
Len Brown [Sun, 26 Dec 2010 22:05:07 +0000 (17:05 -0500)]

Trivial merge