commit 1b6895cdcb08291d8661a4fad92c3bf849443728 Merge: ee53912 31e1fca Author: Iain Arnell <iarnell at gmail.com> Date: Fri Apr 29 05:46:48 2011 +0200 initial pseudo-merge for dist-git setup ---