[libsvm/el5: 3/3] Merge branch 'master' into el5

[Ding-Yi Chen]

commit ca43a8bd1627461c1a1eedc43e8e9137521a9fb8
Merge: e068285 628f6b5
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Thu Jan 12 13:22:52 2012 +1000

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

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