Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
authorAnthony Towns <aj@erisian.com.au>
Sun, 21 Nov 2010 06:08:37 +0000 (16:08 +1000)
committerAnthony Towns <aj@erisian.com.au>
Sun, 21 Nov 2010 06:08:37 +0000 (16:08 +1000)

Trivial merge