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

[Ding-Yi Chen]

commit f2d136828cb3d57c5cb817a5dac14c5f393bf500
Merge: 09c82a6 8f19d12
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Mon Jul 23 02:56:01 2012 +1000

    Merge branch 'master' into el5

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