[cmake-fedora/f16: 9/9] Merge branch 'master' into f16

[Ding-Yi Chen]

commit ccd6b6ecba7424b307f7fc82d3dfc7ed0cfeb1e0
Merge: 36d5034 9077c1b
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Tue Jul 17 15:59:23 2012 +1000

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

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