commit e93bcffe60af272e8a5f67885549e15880e8c06d Merge: 8c13478 ab9e0bf addf78a Author: Iain Arnell <iarnell at gmail.com> Date: Sun Aug 8 09:18:42 2010 +0200 initial pseudo merge for dist-git setup ---