[libsvm/f15: 14/14] Merge branch 'master' into f15

[Ding-Yi Chen]

commit 42dee67eb5821dd847c4ac7b5131873d4b3c023d
Merge: d0ef206 628f6b5
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Thu Jan 12 11:44:05 2012 +1000

    Merge branch 'master' into f15
    
    Conflicts:
    	libsvm.spec

 libsvm.spec |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)
---