[SCM] gmerlin/master: Merge commit '9c19d0f'

[zmoelnig-guest at users.alioth.debian.org]

remove (accidental) double call to (deprecated) png_set_gray...()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4bd0b71d2cd0925d1ee645e9da1c0ea0116a3410
X-Git-Newrev: c7ec7350431501a70c43327687b8a3452b961dd1

The following commit has been merged in the master branch:
commit ba1ab9e34bc605134a3b5168652469a60561c6c3
Merge: f11bcc7f88678996652e2ccb1c837afbcff4fad5 9c19d0fa8f231a5df7feab0ec3e4f6f9efc080c0
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Tue Jan 11 11:24:46 2011 +0100

    Merge commit '9c19d0f'


-- 
gmerlin packaging