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

[Ding-Yi Chen]

commit 905c3927e53546b223f304c2146b8ec1aaaf94a4
Merge: f2d1368 f1f7a05
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Tue Jul 24 01:18:30 2012 +1000

    Merge branch 'master' into el5

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