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

[Ding-Yi Chen]

commit aa687fb6f31043567929181981489282781bf835
Merge: b0fd098 f1f7a05
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Tue Jul 24 01:24:21 2012 +1000

    Merge branch 'master' into el6

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