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

[Ding-Yi Chen]

commit b63a1450f11e7b79f52eb1c94a8c8eb0fdd4841d
Merge: 4860f74 63c4985
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Thu Oct 14 17:07:13 2010 +1000

    Merge branch 'master' into f12

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