[libsvm/f12/master: 9/9] Conflict merge

[Ding-Yi Chen]

commit 8c3a85d3f95f061098ee3cdcce2bca94ecc2a8a1
Merge: 41dc26d 56c7459
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Tue Nov 9 13:44:24 2010 +1000

    Conflict merge

 .gitignore                   |    2 +
 libsvm-3.0.javaDir.patch     |   59 ++++++++++++++++++++++
 libsvm-3.0.packageMain.patch |  114 ++++++++++++++++++++++++++++++++++++++++++
 libsvm-3.0.pythonDir.patch   |   22 ++++++++
 libsvm-3.0.svm-toy.patch     |   70 ++++++++++++++++++++++++++
 libsvm-3.0.toolsDir.patch    |   30 +++++++++++
 libsvm.spec                  |   40 +++++++++++----
 log                          |    9 +++-
 sources                      |    2 +-
 9 files changed, 335 insertions(+), 13 deletions(-)
---