ref: d9520b6415f8e373cf759f316094b986e57f0f5a
parent: 57011e785808847273461aaf6d8ed1df76ff1db9
parent: 52f81b4ef175358d1e1f7f9eecab2a1edb7f4b65
author: Simon Howard <fraggle@gmail.com>
date: Fri Feb 5 22:14:20 EST 2010
Merge from trunk. Subversion-branch: /branches/strife-branch Subversion-revision: 1849