fix conflicts during merge of Arun's tree
[phpfspot.git] / resources / 32_pause.png
resources/32_pause.png