Merge branch 'master' of git://lair.fifthhorseman.net/~dkg/msva
authorMatthew Goins <mjgoins@openflows.com>
Sat, 9 Jan 2010 22:33:56 +0000 (17:33 -0500)
committerMatthew Goins <mjgoins@openflows.com>
Sat, 9 Jan 2010 22:33:56 +0000 (17:33 -0500)

Trivial merge