Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2
authorTimothy Manning <tfhmanning@gmail.com>
Wed, 7 Dec 2011 22:01:43 +0000 (11:01 +1300)
committerTimothy Manning <tfhmanning@gmail.com>
Wed, 7 Dec 2011 22:01:43 +0000 (11:01 +1300)

Trivial merge