Merge branch 'vendor/CVS'
authorJohn Marino <draco@marino.st>
Sat, 7 May 2011 16:04:09 +0000 (18:04 +0200)
committerJohn Marino <draco@marino.st>
Sat, 7 May 2011 16:04:09 +0000 (18:04 +0200)

Trivial merge