Updated to darcs version of Thu Jun  6 10:46:38 BST 2013.