Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2
authorCharles Manning <cdhmanning@gmail.com>
Sun, 6 Feb 2011 20:56:58 +0000 (09:56 +1300)
committerCharles Manning <cdhmanning@gmail.com>
Sun, 6 Feb 2011 20:56:58 +0000 (09:56 +1300)

Trivial merge