[paco/f15: 3/3] Merge branch 'master' into f15

[Veeti Paananen]

commit ec8e243b5c10944c1a40ebf45ddd90e19d29184b
Merge: a52b9ae 31fc175
Author: Veeti Paananen <veeti.paananen at rojekti.fi>
Date:   Tue Aug 9 08:51:18 2011 +0300

    Merge branch 'master' into f15
    
    Conflicts:
    	paco.spec

 paco.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---