From: Michal Marek <mmarek@suse.cz>
Date: Fri, 18 May 2012 10:01:30 +0000 (+0200)
Subject: Merge branch 'scripts'
X-Git-Url: http://git.alex.org.uk

Merge branch 'scripts'

suse-commit: bac03f8cc8bffe71a4be6a6ae20c3ccb114e55a3
---