commit 004ff7fb9ed870db7571c0732fe118576315008b Merge: 99e7b8a b6e5ba0 Author: Ding-Yi Chen <dingyichen at gmail.com> Date: Tue Jul 17 16:46:05 2012 +1000 Merge branch 'master' into el5 .gitignore | 1 + cmake-fedora.spec | 6 +++--- sources | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) ---