commit 48b8e64ef65485b885983b2cb6037fba4be46a75 Merge: 5081268 28dbb4f 77cf1ef 5081268 626da76 Author: Iain Arnell <iarnell at gmail.com> Date: Fri Aug 27 16:35:50 2010 +0200 Initial pseudo merge for dist-git setup ---