[brasero: 6/6] Merging

[Philippe Rouquier <philippr src gnome org>]

commit 981628b383ff708b75c5e44361cf6fbec7b8ef42
Merge: 6ae5ada... a1cda30...
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Sun Apr 19 20:23:59 2009 +0200

    Merging

 ChangeLog                              |   18 ++++++++++++
 libbrasero-burn/brasero-burn-options.c |    3 +-
 libbrasero-burn/brasero-burn.c         |    7 ++++-
 libbrasero-burn/brasero-cover.c        |    9 +++++-
 libbrasero-burn/brasero-session-cfg.c  |   47 +++++++++++++------------------
 libbrasero-burn/brasero-session.c      |   20 ++++++++-----
 libbrasero-burn/brasero-session.h      |    2 +-
 libbrasero-burn/brasero-track-type.c   |    3 ++
 libbrasero-burn/burn-job.c             |    2 +-
 9 files changed, 70 insertions(+), 41 deletions(-)