Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2
authorCharles Manning <cdhmanning@gmail.com>
Tue, 16 Nov 2010 00:53:27 +0000 (13:53 +1300)
committerCharles Manning <cdhmanning@gmail.com>
Tue, 16 Nov 2010 00:53:27 +0000 (13:53 +1300)

Trivial merge