[tasks/f13/master: 10/10] fix merge

[Peter Robinson]

commit 5df827708daab8347765ef46a758321974ec194b
Merge: 38bced6 c14bf2c
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Fri Feb 18 22:29:58 2011 +0000

    fix merge

 sources    |    2 +-
 tasks.spec |   40 +++++++++++++++++++++++++++++-----------
 2 files changed, 30 insertions(+), 12 deletions(-)
---