[k3b/f13/master: 10/10] Merge remote branch 'origin/master' into f13/master

[Rex Dieter]

commit 1d0e8858bb6cc639009263f4fdc9be103b188c1b
Merge: c79f710 7521d07
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jan 20 07:56:01 2011 -0600

    Merge remote branch 'origin/master' into f13/master

 .gitignore                                     |    2 +-
 k3b-2.0.2-use_growisofs_for_dvds.patch         |   32 +++++++++++
 k3b-2.0.2-use_growisofs_instead_of_wodim.patch |   36 +++++++++++++
 k3b-2.0_settings-crash.patch                   |   37 -------------
 k3b.spec                                       |   67 +++++++++++++++--------
 sources                                        |    2 +-
 6 files changed, 114 insertions(+), 62 deletions(-)
---