commit 8b60f41cc9032b0eaf1fedbb6591f6be9d8ca0f3 Merge: 546e4b3 1b0a579 Author: Ding-Yi Chen <dingyichen at gmail.com> Date: Thu Jul 19 13:22:26 2012 +1000 Merge branch 'master' into el5 .gitignore | 1 + cmake-fedora.spec | 6 +++--- sources | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) ---