Merge branch 'vendor/FLEX'
authorJohn Marino <draco@marino.st>
Wed, 16 Jan 2013 01:39:56 +0000 (02:39 +0100)
committerJohn Marino <draco@marino.st>
Wed, 16 Jan 2013 01:39:56 +0000 (02:39 +0100)

Trivial merge