Merge pull request #485 from huceke/trunk-fixes
authorhuceke <ebsi4711@gmail.com>
Wed, 12 Oct 2011 20:16:23 +0000 (13:16 -0700)
committerhuceke <ebsi4711@gmail.com>
Wed, 12 Oct 2011 20:16:23 +0000 (13:16 -0700)
IOS addition and fix


Trivial merge