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

[Ding-Yi Chen]

commit 2b65d7beac2204b755a409e5202fe3d5a78666e3
Merge: 004ff7f b347cf3
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Tue Jul 17 18:23:22 2012 +1000

    Merge branch 'master' into el5

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