Merge branch 'bugzilla-11539' into release

This commit is contained in:
Len Brown 2008-11-11 21:13:55 -05:00
commit 50f19e37c3