Merge branch 'master' of git://git.gag.com/fw/altos
authorAnthony Towns <aj@erisian.com.au>
Fri, 10 Sep 2010 05:50:01 +0000 (15:50 +1000)
committerAnthony Towns <aj@erisian.com.au>
Fri, 10 Sep 2010 05:50:01 +0000 (15:50 +1000)

Trivial merge