Merge pull request #3332 from ace20022/cximage_fixes
authorMartijn Kaijser <machine.sanctum@gmail.com>
Thu, 26 Sep 2013 17:32:03 +0000 (10:32 -0700)
committerMartijn Kaijser <machine.sanctum@gmail.com>
Thu, 26 Sep 2013 17:32:03 +0000 (10:32 -0700)
[Fix] Some cximage fixes


Trivial merge