Merge branch 'kwg'
authorIan Romanick <ian.d.romanick@intel.com>
Thu, 25 Mar 2010 20:22:19 +0000 (13:22 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Thu, 25 Mar 2010 20:22:19 +0000 (13:22 -0700)

Trivial merge