Merge in latest release.
authorBrian Aker <brian@tangent.org>
Wed, 26 Oct 2011 15:47:21 +0000 (08:47 -0700)
committerBrian Aker <brian@tangent.org>
Wed, 26 Oct 2011 15:47:21 +0000 (08:47 -0700)
1  2 
ChangeLog

diff --cc ChangeLog
Simple merge