Merge branch 'master' of git+ssh://comp8440@castor.anu.edu.au/~/comp8440
authorBob Edwards <bob@cs.anu.edu.au>
Fri, 17 Apr 2009 01:01:45 +0000 (11:01 +1000)
committerBob Edwards <bob@cs.anu.edu.au>
Fri, 17 Apr 2009 01:01:45 +0000 (11:01 +1000)

Trivial merge