Merge branch 'bugzilla-14700' into release
authorLen Brown <len.brown@intel.com>
Wed, 16 Dec 2009 03:35:21 +0000 (22:35 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 16 Dec 2009 03:35:21 +0000 (22:35 -0500)

Trivial merge