From 913b655d26bce71269acb8d7e7e57a89cffc3126 Mon Sep 17 00:00:00 2001
From: Michal Minar <miminar@redhat.com>
Date: Wed, 26 Sep 2012 16:00:57 +0200
Subject: [PATCH] Merge branches 'f18' and 'master'