Merge branch 'bugzilla-15100' into release

This commit is contained in:
Len Brown 2011-01-12 04:58:51 -05:00
commit 633379a0f9
2 changed files with 72 additions and 28 deletions