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

[Ding-Yi Chen]

commit 99e7b8a790b77ecbc8f6e9f0361cfafefb2665e1
Merge: 820f7fb 151ad4e
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Tue Jul 17 16:09:34 2012 +1000

    Merge branch 'master' into el5

 sources |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---