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

[Ding-Yi Chen]

commit 09c82a62dc0e5bcfeedd1cb81098a50df8702217
Merge: 8b60f41 ccb208a
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Fri Jul 20 02:03:40 2012 +1000

    Merge branch 'master' into el5

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