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

Trivial merge