ref: b80409202d07732ec201c9816887262b505b81d4
parent: 66e8dc63bd0b384c99f0d0ff60b3d75c42d441b1
parent: 8f6edc1f7402215c5e38d1f03939ce6b5ff5e3ae
author: James Haley <haleyjd@hotmail.com>
date: Mon Jan 25 19:59:02 EST 2010
Merge from raven-branch Subversion-branch: /branches/strife-branch Subversion-revision: 1825