fix color merge

This commit is contained in:
j 2011-10-28 11:58:40 +02:00
parent b719c544ad
commit eef82edda8