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

[Ding-Yi Chen]

commit c18bcc75bbd84f03571687c57a01e012b52300d0
Merge: 2b65d7b 13e199b
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Wed Jul 18 15:39:30 2012 +1000

    Merge branch 'master' into el5

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