Merge branch 'bugzilla-12270' into release

This commit is contained in:
Len Brown 2009-04-24 01:35:33 -04:00
commit 04a2e6297d