Merge branch 'png'
authorTony Cook <tony@develop-help.com>
Sun, 29 Apr 2012 04:54:18 +0000 (14:54 +1000)
committerTony Cook <tony@develop-help.com>
Sun, 29 Apr 2012 04:54:18 +0000 (14:54 +1000)

Trivial merge