Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2
authorTimothy Manning <tfhmanning@gmail.com>
Mon, 10 Jan 2011 23:23:05 +0000 (12:23 +1300)
committerTimothy Manning <tfhmanning@gmail.com>
Mon, 10 Jan 2011 23:23:05 +0000 (12:23 +1300)

Trivial merge