ref: 122dcc372f579c54ba2e6f793493cfa4d0a7d609
parent: 46ad00deca23f3c57fcaed47af67f9003d6a4048
parent: b6491fa4aefc073a760d4bad51f55c2d6c0f5f35
author: Simon Howard <fraggle@gmail.com>
date: Tue Jun 9 14:28:51 EDT 2009
Merge from trunk. Subversion-branch: /branches/raven-branch Subversion-revision: 1579