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

[Ding-Yi Chen]

commit c34b613a6c061705e61103ac404497dccd9808b7
Merge: 5e8b2d6 3d80df4
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Tue Aug 21 13:14:10 2012 +1000

    Merge branch 'master' into el6

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