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

[Ding-Yi Chen]

commit 11a29ba9669bf2f8a9d601ba060c915dbc09e0f9
Merge: c061f41 ce22b6d
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Tue Jul 17 18:30:08 2012 +1000

    Merge branch 'master' into f17

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