Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2
authorCharles Manning <cdhmanning@gmail.com>
Thu, 13 Jan 2011 00:23:15 +0000 (13:23 +1300)
committerCharles Manning <cdhmanning@gmail.com>
Thu, 13 Jan 2011 00:23:15 +0000 (13:23 +1300)

Trivial merge