commit c8d115dd7fc8e45356b61c42be831e23c72d88f9 Merge: 2d15732 daafe0d f59e774 2d15732 2f4e1c0 Author: Iain Arnell <iarnell at gmail.com> Date: Fri Aug 27 16:27:13 2010 +0200 Initial pseudo merge for dist-git setup ---