[paco/f14: 5/5] Merge branch 'f15' into f14

[Veeti Paananen]

commit 46dab6ca3fcc10dbd448554e18c0744a73d98890
Merge: b231973 ec8e243
Author: Veeti Paananen <veeti.paananen at rojekti.fi>
Date:   Tue Aug 9 08:53:47 2011 +0300

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

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