Merge branch 'bugzilla-13745' into release
authorLen Brown <len.brown@intel.com>
Tue, 1 Sep 2009 03:42:51 +0000 (23:42 -0400)
committerLen Brown <len.brown@intel.com>
Tue, 1 Sep 2009 03:42:51 +0000 (23:42 -0400)

Trivial merge