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

[Ding-Yi Chen]

commit c061f41259e2a223bf640ef4fd09a7485c94615b
Merge: 8781380 ebfb24c
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Tue Jul 17 16:53:29 2012 +1000

    Merge branch 'master' into f17

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