ref: afa0c4c7979c1508605d0e79487f299cd03adda6
parent: 095bc1110b3c11fbf2e17bfd51bf78909fe34662
parent: 2c6e7b2f10c32ca0406ca6753e7701d83e6dea8f
author: Simon Howard <fraggle@gmail.com>
date: Sat Nov 21 11:36:46 EST 2009
Merge from trunk. Subversion-branch: /branches/raven-branch Subversion-revision: 1737