[tesseract-langpack/f19: 4/4] Merge branch 'master' into f19

[Karol Trzcionka]

commit b49a1bdce2d28ac81abaa7f3ede5274c023e1c2d
Merge: b7396c8 fdb18ab
Author: Karol Trzcionka <karlik at fedoraproject.org>
Date:   Sun Apr 28 02:08:28 2013 +0200

    Merge branch 'master' into f19
    
    Conflicts:
    	tesseract-langpack.spec

 tesseract-langpack.spec |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---