commit dbea679363f1c4da0aa4ef6ee2bea8d96dfc7a30 Merge: 8a4863f f1d06f0 a6d2048 Author: Iain Arnell <iarnell at gmail.com> Date: Sun Aug 8 09:22:31 2010 +0200 initial pseudo merge for dist-git setup ---