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

[Ding-Yi Chen]

commit 5740b55cda9f6094a8537f5f47ca84b0858fdc13
Merge: 9ade696 8f19d12
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Mon Jul 23 03:01:24 2012 +1000

    Merge branch 'master' into f17

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