commit 59077a2be92883558718b0035bababb78fbb7205 Merge: 88df7d9 6e23c00 c0003d8 Author: Iain Arnell <iarnell at gmail.com> Date: Sat Oct 2 13:16:08 2010 +0200 Initial pseudo merge for dist-git setup ---