[girara/f16: 3/3] Merge branch 'master' into f16

[François Cami]

commit c0d9c1a67e2d82b6d125227f909d6a232b97f15e
Merge: 1335784 cf16ecb
Author: François Cami <fcami at fedoraproject.org>
Date:   Tue Nov 27 22:40:14 2012 +0100

    Merge branch 'master' into f16
    
    Conflicts:
    	girara.spec

 .gitignore  |    1 +
 girara.spec |   10 +++++-----
 sources     |    2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)
---