Merge branch 'vendor/BMAKE'
authorJohn Marino <draco@marino.st>
Sun, 21 Oct 2012 19:06:35 +0000 (21:06 +0200)
committerJohn Marino <draco@marino.st>
Sun, 21 Oct 2012 19:06:35 +0000 (21:06 +0200)

Trivial merge