[cmake-fedora/f17: 8/8] Merge branch 'master' into f17

[Ding-Yi Chen]

commit 878138069135dc25794ee23e966874aaf5f5a51e
Merge: 695e1d2 9077c1b
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Tue Jul 17 15:58:08 2012 +1000

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

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