Merge branch 'master' of git://repo.or.cz/cslatevm
authorBrian T. Rice <briantrice@gmail.com>
Thu, 18 Mar 2010 03:09:42 +0000 (20:09 -0700)
committerBrian T. Rice <briantrice@gmail.com>
Thu, 18 Mar 2010 03:09:42 +0000 (20:09 -0700)

Trivial merge