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

Trivial merge