commit a68128be7da072c1ff86993e03353243b38e6280 Merge: 4e969c8 85567cc 058d849 Author: Iain Arnell <iarnell at gmail.com> Date: Sat Sep 25 08:54:05 2010 +0200 Initial pseudo merge for dist-git setup ---