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