commit c9c98d7e7550236db8816f24ad7855f1c0d4f40b Merge: 1e62acd 6ebe798 f0c380b 1e62acd 6ebe798 Author: Iain Arnell <iarnell at gmail.com> Date: Thu Sep 2 04:57:16 2010 +0200 initial pseudo-merge for dist-git setup ---