Merge branch 'vendor/MPC'
authorJohn Marino <draco@marino.st>
Sat, 29 Sep 2012 19:04:33 +0000 (21:04 +0200)
committerJohn Marino <draco@marino.st>
Sat, 29 Sep 2012 19:04:33 +0000 (21:04 +0200)

Trivial merge