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

[Ding-Yi Chen]

commit 546e4b36d95f706670032f029115cfb2624eeba9
Merge: c18bcc7 42b61a6
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Thu Jul 19 01:39:20 2012 +1000

    Merge branch 'master' into el5

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