[k3b/f13/master: 15/15] Fixed merge conflict

[Radek Novacek]

commit f853761f8a5203bd4ea85f996eb217a17fd6e8ba
Merge: 8109db8 6137552
Author: Radek Novacek <rnovacek at redhat.com>
Date:   Tue Aug 31 14:55:27 2010 +0200

    Fixed merge conflict

 k3b-2.0_settings-crash.patch |   37 +++++++++++++++++++++++++++++++++++++
 k3b.spec                     |   11 ++++++++---
 2 files changed, 45 insertions(+), 3 deletions(-)
---