Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2
authorCharles Manning <cdhmanning@gmail.com>
Fri, 18 Jan 2013 02:17:53 +0000 (15:17 +1300)
committerCharles Manning <cdhmanning@gmail.com>
Fri, 18 Jan 2013 02:17:53 +0000 (15:17 +1300)

Trivial merge