commit e167e94d9788cabd76edc400cdc9c8fb4320039c Merge: d763f49 fa339f5 2a2c82a d763f49 fa339f5 Author: Iain Arnell <iarnell at gmail.com> Date: Tue Aug 31 05:53:39 2010 +0200 initial pseudo-merge for dist-git setup ---