[cmake-fedora/el5] (2 commits) ...Merge branch 'master' into el5

[Ding-Yi Chen]

Summary of changes:

  910d987... ;Fixed Bug 1040333, 1046213;-b;1040333,1046213 (*)
  1f647f4... Merge branch 'master' into el5

(*) This commit already existed in another branch; no separate mail sent