[hyphen-mr/f18: 2/2] Merge branch 'master' into f18

[pnemade]

commit 1fdbcbde45e0defa384398988bddc8d09f07cb47
Merge: 6221993 9c4450c
Author: Parag Nemade <pnemade at redhat.com>
Date:   Thu Nov 29 11:50:38 2012 +0530

    Merge branch 'master' into f18

 hyphen-mr.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---