Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2
authorCharles Manning <cdhmanning@gmail.com>
Mon, 8 Nov 2010 23:06:41 +0000 (12:06 +1300)
committerCharles Manning <cdhmanning@gmail.com>
Mon, 8 Nov 2010 23:06:41 +0000 (12:06 +1300)

Trivial merge