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

[Ding-Yi Chen]

commit a0ee9e19755832ccecb048dcd4eb66305aac6a98
Merge: 905c392 31aa17c
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Sat Aug 18 08:28:32 2012 +1000

    Merge branch 'master' into el5

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