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

[Ding-Yi Chen]

commit 9f7ca28c1bb08cd45c0651a3868a9b9b010bdd86
Merge: 1ce1a63 b1e6f49
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Mon Nov 8 10:48:49 2010 +1000

    Merge branch 'master' into f12

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