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

[Ding-Yi Chen]

commit 1ce1a63910a265b9ffc9a29a6d2fb7ad0f1a9ae0
Merge: 656fea2 9b2b339
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Tue Nov 2 15:27:51 2010 +1000

    Merge branch 'master' into f12

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