Merge branch 'bugzilla-12270' into release
authorLen Brown <[email protected]>
Fri, 24 Apr 2009 05:35:33 +0000 (01:35 -0400)
committerLen Brown <[email protected]>
Fri, 24 Apr 2009 05:35:33 +0000 (01:35 -0400)

Trivial merge