Merge remote branch 'gerth/lua'
authorH. Peter Anvin <hpa@linux.intel.com>
Mon, 19 Jul 2010 20:18:24 +0000 (13:18 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Mon, 19 Jul 2010 20:18:24 +0000 (13:18 -0700)

Trivial merge