commit 6abf0fe48e2ae1e0e99378a154c781583a4af043 Merge: 359995c 4871c7c Author: Iain Arnell <iarnell at gmail.com> Date: Tue May 3 05:23:10 2011 +0200 initial pseudo-merge for dist-git setup ---