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

[Ding-Yi Chen]

commit 28c54cba0e6e870c8985993f8114ff4fbcdd39f5
Merge: f3a5bc8 ccb208a
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Fri Jul 20 03:35:43 2012 +1000

    Merge branch 'master' into el6

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