ref: 391e7466b1efb7cbede4a1c356a210d9e7ee616b
parent: fa328faf056affa216f2f3a8764ca0d56262efe9
parent: 822664b4ff873d462370e9e96a9d91e6066c221d
author: Simon Howard <fraggle@gmail.com>
date: Mon Jun 13 18:21:37 EDT 2011
Merge from trunk. Subversion-branch: /branches/raven-branch Subversion-revision: 2347