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

[Ding-Yi Chen]

commit 754a36e55b99960fbc8684fbd1a4600dd8f6e6ba
Merge: 145aec8 de9fa6e
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Tue Jul 17 17:25:36 2012 +1000

    Merge branch 'master' into el6

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