ref: 677729c658b39f075e563fbc9f5a898641f7de54
parent: 8a77b34e936a3fd752db3bc1113e3d7bd0555440
parent: b4f2d75b34b6e2b9bbb2fa6449125d3446a93a73
author: Simon Howard <fraggle@gmail.com>
date: Fri Feb 5 18:08:12 EST 2010
Merge from trunk. Subversion-branch: /branches/raven-branch Subversion-revision: 1845