commit ef977b201084906f188e5875078b83b4cec4c1b1 Merge: 7c2dc36 4583dc2 8294c3b 7c2dc36 4583dc2 Author: Iain Arnell <iarnell at gmail.com> Date: Wed Aug 25 05:27:55 2010 +0200 initial pseudo-merge for dist-git setup ---