commit 0f8c31444ccfafe73acf5990a8297e239869536c Merge: 19acc1c 12bd576 2d1800e 2ac470e 12bd576 Author: Iain Arnell <iarnell at gmail.com> Date: Sat Aug 28 09:21:29 2010 +0200 initial pseudo-merge for dist-git setup ---