commit 0984fdc7c0e5995e1665b3b93bc02c2af16fca9f Merge: d309de4 628f6b5 Author: Ding-Yi Chen <dingyichen at gmail.com> Date: Thu Jan 12 11:23:01 2012 +1000 Merge branch 'master' into f16 Conflicts: libsvm.spec libsvm.spec | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) ---