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

[Ding-Yi Chen]

commit 5282bb17dcd2ec873a0fe46de699df5bd523f903
Merge: e153633 8f19d12
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Mon Jul 23 02:47:46 2012 +1000

    Merge branch 'master' into f16

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