commit 0e5f5facceec4fcf19f3a09c5d123ffc38e2d04b Merge: 7ef2ba1 75039c4 Author: Honza HorĂ¡k <hhorak at redhat.com> Date: Thu Feb 14 10:20:22 2013 +0100 Merge branch 'f18' into el6 Conflicts: mariadb.spec mariadb.spec | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) ---