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

[Ding-Yi Chen]

commit a5e7a90733a4688c43f969723fd0ad6b8fc4f4b3
Merge: 55be738 31aa17c
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Sat Aug 18 08:34:18 2012 +1000

    Merge branch 'master' into f17

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