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

[Ding-Yi Chen]

commit e1536336f638240c1a3fa1d18fdc1806ebf7b2ba
Merge: c990e7e ccb208a
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Fri Jul 20 02:59:25 2012 +1000

    Merge branch 'master' into f16

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