Merge branch 'linux1'
authorPeter Howkins <peter@x-1204.(none)>
Wed, 4 Jul 2012 15:20:43 +0000 (16:20 +0100)
committerPeter Howkins <peter@x-1204.(none)>
Wed, 4 Jul 2012 15:20:43 +0000 (16:20 +0100)

Trivial merge