ref: 1bcdb39fd1b273941c493be9259b44c8560b5d16
parent: bab992ea55ea849d606e1733f10be42488441ab7
parent: df292a6dce27e7b20faa0c829aa0c58a3693f979
author: Simon Howard <fraggle@gmail.com>
date: Sun Sep 11 19:07:23 EDT 2011
Merge from trunk. Subversion-branch: /branches/raven-branch Subversion-revision: 2365