Merge branch 'master' into memdisk-maxmem-for-hpa
authorGene Cumm <gene.cumm@gmail.com>
Mon, 7 Feb 2011 02:24:30 +0000 (21:24 -0500)
committerGene Cumm <gene.cumm@gmail.com>
Mon, 7 Feb 2011 02:24:30 +0000 (21:24 -0500)

Trivial merge