Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2
authorCharles Manning <cdhmanning@gmail.com>
Thu, 6 May 2010 22:08:22 +0000 (10:08 +1200)
committerCharles Manning <cdhmanning@gmail.com>
Thu, 6 May 2010 22:08:22 +0000 (10:08 +1200)

Trivial merge