extra/imagemagick to 6.8.7.4-1
extra/mplayer to 36498-2
extra/mplayer to 36498-2
extra/imagemagick to 6.8.7.4-2
Merge remote-tracking branch 'upstream/master'