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

[Ding-Yi Chen]

commit 16e653fc72547017a52bd98c1d71a0969986721f
Merge: c3366c4 5b88016
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Tue Nov 26 13:40:53 2013 +1000

    Merge branch 'master' into el5

 .gitignore        |    1 +
 cmake-fedora.spec |   23 ++++++++++++++++++++---
 sources           |    2 +-
 3 files changed, 22 insertions(+), 4 deletions(-)
---