[libopm/el5: 11/11] Merge remote branch 'origin/el6' into el5

[Robert Scheck]

commit 1377e8478b774d8b62e65abce0b65fd660a1dea0
Merge: 958479a 30502b6
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Thu Feb 28 00:57:50 2013 +0100

    Merge remote branch 'origin/el6' into el5
    
    Conflicts:
    	libopm.spec

 libopm.spec |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---