Merge branch 'bugzilla-13620' into release
authorLen Brown <len.brown@intel.com>
Sat, 19 Sep 2009 06:09:37 +0000 (02:09 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 19 Sep 2009 06:09:37 +0000 (02:09 -0400)

Trivial merge