commit 12175c2bbda1efab1111a5587978bfa8ec0faa1b Merge: 5f3f950 56eb3cc c64f931 1108471 56eb3cc Author: Iain Arnell <iarnell at gmail.com> Date: Tue Aug 31 06:09:24 2010 +0200 initial pseudo-merge for dist-git setup ---