[cmake-fedora/f16: 2/2] Merge branch 'master' into f16

[Ding-Yi Chen]

commit 1e7c2e88ac7cbdb41dc5860933c5497028821c88
Merge: 5282bb1 f1f7a05
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Tue Jul 24 00:51:05 2012 +1000

    Merge branch 'master' into f16

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