Merge branch 'bugzilla-102904-workaround' into release

This commit is contained in:
Len Brown 2010-06-12 00:58:01 -04:00
commit e9e8b4dd14