commit 19efa14ba519811f29d11bb9a06aa55e4a39b893 Merge: a1db684 c19e1c4 5a79d60 a1db684 c19e1c4 Author: Iain Arnell <iarnell at gmail.com> Date: Wed Aug 25 05:51:14 2010 +0200 initial pseudo-merge for dist-git setup ---