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

[Ding-Yi Chen]

commit b0fd09885cb3da58be99efd5d37818cd4bd5ceab
Merge: 28c54cb 8f19d12
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Mon Jul 23 03:15:16 2012 +1000

    Merge branch 'master' into el6

 .gitignore        |    1 +
 cmake-fedora.spec |   10 ++++++----
 sources           |    2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)
---