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

[Ding-Yi Chen]

commit 9ade696352ba313b5a1c63ba32204abf02958f77
Merge: d84f19e ccb208a
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Fri Jul 20 02:34:27 2012 +1000

    Merge branch 'master' into f17

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