[lm_sensors/f14/master: 3/3] Merge branch 'master' into f14

[Nikola Pajkovsky]

commit c13ed875457115ada61b4295a49527501f1e1346
Merge: 7fcb23f cc11872
Author: Nikola Pajkovsky <npajkovs at redhat.com>
Date:   Mon Oct 11 11:07:56 2010 +0200

    Merge branch 'master' into f14
    
    * master:
      bump up version 3.2.0
      update lm_sensors from svn
    
    Conflicts:
    	.gitignore
    	lm_sensors.spec
    	sources

 .gitignore      |    1 +
 lm_sensors.spec |   14 +++++++++-----
 sources         |    2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)
---