Merge branch 'vendor/BMAKE'
authorJohn Marino <draco@marino.st>
Sat, 23 Nov 2013 11:32:57 +0000 (12:32 +0100)
committerJohn Marino <draco@marino.st>
Sat, 23 Nov 2013 11:32:57 +0000 (12:32 +0100)

Trivial merge