[lensfun/f14/master: 4/4] Merge branch 'f14' into f13

[Nils Philippsen]

commit 200c201ca22c088a6ade8f4906679ca02031e0cf
Merge: 452c6ce 9facbd4
Author: Nils Philippsen <nils at redhat.com>
Date:   Mon Sep 20 18:31:54 2010 +0200

    Merge branch 'f14' into f13
    
    Conflicts:
    	lensfun.spec

 lensfun-0.2.5-cpuid.patch |  128 +++++++++++++++++++++++++++++++++++++++++++++
 lensfun.spec              |   13 ++++-
 2 files changed, 140 insertions(+), 1 deletions(-)
---