Merge branch 'bugzilla-11715' into test
authorLen Brown <len.brown@intel.com>
Thu, 23 Oct 2008 05:28:19 +0000 (01:28 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 23 Oct 2008 05:28:19 +0000 (01:28 -0400)

Trivial merge