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

[Ding-Yi Chen]

commit 145aec85929205830ba9681c7b36a7ac58323256
Merge: de9134d 9077c1b
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Tue Jul 17 15:55:43 2012 +1000

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	cmake-fedora.spec
    	sources

 .gitignore        |    5 +++++
 cmake-fedora.spec |   37 +++++++++++++------------------------
 sources           |    2 +-
 3 files changed, 19 insertions(+), 25 deletions(-)
---