commit f4cafb6a3f59849b05e1923da8c7bf37e7e54963 Merge: d366dfb c80c202 ec6d02a d366dfb Author: Iain Arnell <iarnell at gmail.com> Date: Sun Aug 29 11:13:36 2010 +0200 Initial pseudo merge for dist-git setup ---