Merge pull request #3408 from eileenmcnaughton/testfixes_and_tidy_ups
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 3 Jun 2014 09:40:10 +0000 (21:40 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Tue, 3 Jun 2014 09:40:10 +0000 (21:40 +1200)
Testfixes and tidy ups


Trivial merge