commit 336a4d1100c77696fa220d41afa0dcd20aa1562a Merge: 397641f a3151e5 8e300b5 Author: Iain Arnell <iarnell at gmail.com> Date: Fri Aug 13 15:59:55 2010 +0200 Initial pseudo merge for dist-git setup ---