Merge branch 'bugzilla-11481' into test
authorLen Brown <len.brown@intel.com>
Thu, 23 Oct 2008 03:20:02 +0000 (23:20 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 23 Oct 2008 03:20:02 +0000 (23:20 -0400)

Trivial merge