Merge branch 'mainline'
authortwinaphex <autechre1024@hotmail.com>
Mon, 25 Mar 2013 02:20:16 +0000 (03:20 +0100)
committertwinaphex <autechre1024@hotmail.com>
Mon, 25 Mar 2013 02:20:16 +0000 (03:20 +0100)

Trivial merge