From: Anthony Towns <aj@erisian.com.au>
Date: Wed, 17 Nov 2010 19:54:06 +0000 (+1000)
Subject: Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
X-Git-Tag: debian/0.7.1+117+ge7954c8~8^2~16
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=939be6793238a275b7682ecc376fed14379cf044;hp=939be6793238a275b7682ecc376fed14379cf044

Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox

Conflicts:
	ao-tools/altosui/AltosFlightUI.java
---