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

[Ding-Yi Chen]

commit 656fea216c7ba0027680c098eda24d06f3a9ba6a
Merge: 0b4f0ca bbf178b
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Wed Oct 20 09:30:43 2010 +1000

    Merge branch 'master' into f12

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