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

[Ding-Yi Chen]

commit d0ec93c68fb6d990faa802b5fae0309c1267bd6f
Merge: 1e7c2e8 31aa17c
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Sat Aug 18 08:48:11 2012 +1000

    Merge branch 'master' into f16

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