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

[Ding-Yi Chen]

commit c3366c44e4a64068ec31aab9ae27c33d889d1d54
Merge: 7035e48 6d72a21
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Mon Nov 25 16:04:22 2013 +1000

    Merge branch 'master' into el5

 .gitignore        |    2 +
 cmake-fedora.spec |   89 +++++++++++++++++++++++++++++++++++++++++++++-------
 sources           |    2 +-
 3 files changed, 80 insertions(+), 13 deletions(-)
---