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

[Nikola Pajkovsky]

commit 1ed28938e421e2df04bee27eef9cb23f5a04330f
Merge: c13ed87 7478671
Author: Nikola Pajkovsky <npajkovs at redhat.com>
Date:   Tue Mar 29 12:36:37 2011 +0200

    Merge branch 'master' into f14
    
    * master:
      fix rhbz#691548 and new 3.3.0 release
      - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

 .gitignore      |    1 +
 lm_sensors.spec |   12 +++++++++++-
 sources         |    2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
---