Merge svm branch, will work on head.
authorChris Hanson <org/chris-hanson/cph>
Mon, 15 Jun 2009 04:33:42 +0000 (21:33 -0700)
committerChris Hanson <org/chris-hanson/cph>
Mon, 15 Jun 2009 04:33:42 +0000 (21:33 -0700)

Trivial merge