[mhonarc/f13/master: 2/2] Merge branch 'master' into f13

[José Abílio Oliveira Matos]

commit 3f8bbd2dc2a2c7f1dfcb29c6d65681f775a70642
Merge: 6737746 6a83c4c
Author: José Matos <jamatos at fedoraproject.org>
Date:   Tue Mar 15 10:41:34 2011 +0000

    Merge branch 'master' into f13

 mhonarc.spec |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---