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

[Ding-Yi Chen]

commit bf9992b5370546768ddf69df08701b735d0a4d3c
Merge: d0ec93c 3d80df4
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Tue Aug 21 13:07:14 2012 +1000

    Merge branch 'master' into f16

 .gitignore        |    1 +
 cmake-fedora.spec |   18 ++++++++++++++----
 sources           |    2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)
---