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

[Ding-Yi Chen]

commit d84f19e7020bb4fa1c0a0d25f9c5b890c0489dc3
Merge: 480741a 1b0a579
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Thu Jul 19 17:35:32 2012 +1000

    Merge branch 'master' into f17

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