Merge branch 'bugzilla-13036' into release
Len Brown [Fri, 24 Apr 2009 14:42:21 +0000 (10:42 -0400)]

Trivial merge