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

[Ding-Yi Chen]

commit 298ff68affd45a634fc6b24a9669446e071c7429
Merge: b63a145 fdc6aff
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Fri Oct 15 11:11:12 2010 +1000

    Merge branch 'master' into f12

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