Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2
authorCharles Manning <cdhmanning@gmail.com>
Wed, 22 Dec 2010 21:47:36 +0000 (10:47 +1300)
committerCharles Manning <cdhmanning@gmail.com>
Wed, 22 Dec 2010 21:47:36 +0000 (10:47 +1300)

Trivial merge