ref: 22fc405736dc4796958de221c07d52432f1b271b
parent: f391d85c96afa91a2302c58191ce8d401fdba2e2
parent: 64918568eee62c73cbb87aa1bd68e191f19a4af3
author: Simon Howard <fraggle@gmail.com>
date: Tue Aug 31 15:26:32 EDT 2010
Merge from trunk. Subversion-branch: /branches/raven-branch Subversion-revision: 1987