commit 1f23bba424f2a651a19f8593f5c477b913463533 Merge: 828e162 decd627 9d1809a 828e162 decd627 Author: Iain Arnell <iarnell at gmail.com> Date: Tue Aug 31 05:10:45 2010 +0200 initial pseudo-merge for dist-git setup ---