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

[Ding-Yi Chen]

commit 0b4f0ca0be1acd587ffc0844fd07cc7e5aa18eca
Merge: 298ff68 172f668
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Sat Oct 16 17:51:45 2010 +1000

    Merge branch 'master' into f12

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