Merge branch 'release/0.2.5' into dev

This commit is contained in:
Justin Hileman
2010-07-06 10:23:43 -04:00