Merge branches 'bugzilla-12461' and 'bugzilla-9998' into release
authorLen Brown <len.brown@intel.com>
Sun, 5 Apr 2009 05:51:10 +0000 (01:51 -0400)
committerLen Brown <len.brown@intel.com>
Sun, 5 Apr 2009 05:51:10 +0000 (01:51 -0400)

Trivial merge