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

[Ding-Yi Chen]

commit 820f7fb5617ce78e4d12049ee139af6081c8aa08
Merge: 76353cd 72b7c95
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Tue Jul 17 15:42:08 2012 +1000

    Merge branch 'master' into el5

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