[cmake-fedora/el5: 11/11] Merge branch 'master' into el5

[Ding-Yi Chen]

commit 76353cdd6c3b5c697f9d82c0e3ddc6179b751997
Merge: 0d90c86 de0fb2c
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Tue Jul 17 15:38:30 2012 +1000

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

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