Merge branches 'bugzilla-12461' and 'bugzilla-9998' into release

This commit is contained in:
Len Brown 2009-04-05 01:51:10 -04:00