commit 3a71706203b550268c02d99c079c0bebe8c027af Merge: 7fb2cba db6c863 4fb6891 c2f44e3 Author: Iain Arnell <iarnell at gmail.com> Date: Fri Aug 27 16:13:56 2010 +0200 Initial pseudo merge for dist-git setup ---