commit e37f7ee0808ce49f7ec3b5fb374cc94c312cce5e Author: Erinn Clark <erinn@xxxxxxxxxxxxxx> Date: Tue Jan 18 06:15:13 2011 +0100 Merge branches 'bug2406' and 'master'