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

[Ding-Yi Chen]

commit c990e7e84aa97a69a1027787716c24e33ee23c5f
Merge: 098e11b 1b0a579
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Thu Jul 19 13:59:32 2012 +1000

    Merge branch 'master' into f16

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