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

[Ding-Yi Chen]

commit 55be7380cf6043d4e96be852ce7985293aa3c55d
Merge: 5740b55 f1f7a05
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Tue Jul 24 00:58:19 2012 +1000

    Merge branch 'master' into f17

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