commit b47a4ed680531b88790ed961bdc99d0ef342b0bb Merge: 6872951 4d8e1e8 Author: Peter Robinson <pbrobinson at gmail.com> Date: Mon Mar 28 03:15:15 2011 +0100 fix merge ---