commit 63c1700fb0ff7f22f57fc4b12ca541a585beb61e Merge: 0b492a2 0c972f2 Author: Nils Philippsen <nils at redhat.com> Date: Fri Aug 13 11:24:19 2010 +0200 Merge branch 'f14' into f13 .gitignore | 2 +- dcraw.spec | 15 ++++++++++++--- sources | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) ---