[hunspell/f17: 4/4] Merge branch 'master' into f17

[Caolán McNamara]

commit 63eabe0c6e08339042ce77174abe89f49fef9f72
Merge: 51e75f9 4064bbf
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 11 11:34:37 2012 +0100

    Merge branch 'master' into f17
    
    Conflicts:
    	hunspell.spec

 hunspell.spec |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
---