Merge branch 'multiprocessing' into neil
authorNeil Smith <neil.git@njae.me.uk>
Sun, 3 Nov 2013 15:53:01 +0000 (15:53 +0000)
committerNeil Smith <neil.git@njae.me.uk>
Sun, 3 Nov 2013 15:53:01 +0000 (15:53 +0000)

Trivial merge