Merge branch 'bugzilla-13671' into release
authorLen Brown <len.brown@intel.com>
Wed, 30 Dec 2009 07:51:31 +0000 (02:51 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 30 Dec 2009 07:51:31 +0000 (02:51 -0500)

Trivial merge