commit 6522a06fa87a6528187b66e5c425fb92917a18f1 Merge: b63a01b f76f363 fcc9c6b b63a01b f76f363 Author: Iain Arnell <iarnell at gmail.com> Date: Wed Aug 25 05:05:11 2010 +0200 initial pseudo-merge for dist-git setup ---