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

[Ding-Yi Chen]

commit 229c1371d35bdd256fc8b89f88b7a3a0e4c078e3
Merge: 33024b2 628f6b5
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Thu Jan 12 13:09:39 2012 +1000

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

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