commit 5924d069a8187727d016deb9b94c1aa05aeb3b80 Merge: 9b8b663 265afcd a468101 9b8b663 265afcd Author: Iain Arnell <iarnell at gmail.com> Date: Fri Aug 27 16:22:33 2010 +0200 Initial pseudo merge for dist-git setup ---