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

[Ding-Yi Chen]

commit 7035e483a411f057071fe647294a78b761bdfe93
Merge: a0ee9e1 3d80df4
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Tue Aug 21 12:39:50 2012 +1000

    Merge branch 'master' into el5

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