[e16/f13/master: 4/4] Merge branch 'master' into f13

[terjeros]

commit 71ba8ec78eb2d9d80ecb56b6ce746216f53ed42a
Merge: afee9f8 9170ca7
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Sat Jan 29 18:50:08 2011 +0100

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

 .gitignore          |    1 +
 e16-1.0.2-dso.patch |   12 ------------
 e16.spec            |    7 ++++---
 sources             |    2 +-
 4 files changed, 6 insertions(+), 16 deletions(-)
---