[cmake-fedora/f17: 4/4] Merge branch 'master' into f17

[Ding-Yi Chen]

commit 480741a41c8431d5c0bf967ce379ddb5b6878142
Merge: 11a29ba 5be2fdc
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Wed Jul 18 19:09:29 2012 +1000

    Merge branch 'master' into f17

 .gitignore        |    3 +++
 cmake-fedora.spec |    6 +++---
 sources           |    2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
---