[luminance-hdr/f17: 3/3] Merge branch 'f17' of ssh://pkgs.fedoraproject.org/luminance-hdr into f17

[Franco Comida]

commit be938e64c416529e95ddb78a63f0611ca5bb7e82
Merge: 8eff1e3 1c52264
Author: Franco Comida <francocomida at google.com>
Date:   Wed Jul 4 22:49:29 2012 +0100

    Merge branch 'f17' of ssh://pkgs.fedoraproject.org/luminance-hdr into f17
    
    Conflicts:
    	luminance-hdr.spec

 luminance-hdr-2.2.1-non-x86.patch |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)
---