commit 506ae26cf72364fdfd7851167e85391f69ad9acd Merge: bf873d9 affaefb ee80797 Author: Iain Arnell <iarnell at gmail.com> Date: Sun Oct 3 08:20:36 2010 +0200 Initial pseudo merge for dist-git setup ---