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

[Ding-Yi Chen]

commit 9704eb68ef47c87e7a1cf275677b203aae44c937
Merge: 754a36e 646e799
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Wed Jul 18 13:54:59 2012 +1000

    Merge branch 'master' into el6

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