Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
authorAnthony Towns <aj@erisian.com.au>
Wed, 24 Nov 2010 01:55:14 +0000 (11:55 +1000)
committerAnthony Towns <aj@erisian.com.au>
Wed, 24 Nov 2010 01:55:14 +0000 (11:55 +1000)

Trivial merge