From 908395ce1d81e041cbda24b362f21fd7977017327096ca2ba34aed8785182add Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Sat, 22 Mar 2014 13:45:10 +0000
Subject: [PATCH] Accepting request 225692 from X11:MATE:Factory

Fix conflicts and license

OBS-URL: https://build.opensuse.org/request/show/225692
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/eom?expand=0&rev=1