commit 736344610eb9ac4e890b6590f43c98d070d10c88 Merge: f7af5a3 4225155 6dfdfa1 f7af5a3 4225155 Author: Iain Arnell <iarnell at gmail.com> Date: Fri Aug 27 16:19:27 2010 +0200 Initial pseudo merge for dist-git setup ---