commit be33403a07c57a2562f0424de0c6372c3f96b6e1 Merge: fb8c504 c3cfe41 1c3760b Author: Iain Arnell <iarnell at gmail.com> Date: Sat Dec 18 10:12:02 2010 +0100 Initial pseudo merge for dist-git setup ---