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

[Ding-Yi Chen]

commit f3a5bc8f7351c5d576b69b318d02da0a2145f6eb
Merge: 9704eb6 1b0a579
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Thu Jul 19 16:42:18 2012 +1000

    Merge branch 'master' into el6

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