[rubygem-locale/f17: 2/2] Merge branch 'master' into f17

[Vít Ondruch]

commit 35f51efb8d734f57859ecd8794c6be9b71fc3c92
Merge: 1972639 d679852
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Tue Apr 3 10:19:52 2012 +0200

    Merge branch 'master' into f17

 rubygem-locale.spec |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)
---