[brasero: 6/6] Merge branch 'audio_spanning'

[Philippe Rouquier <philippr src gnome org>]

commit e79ea58f169d09eb0745984e0c56e990cf4db35a
Merge: d6a3dd2... dd4ca95...
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Mon May 11 22:30:43 2009 +0200

    Merge branch 'audio_spanning'

 libbrasero-burn/brasero-image-properties.c   |   10 +++++++---
 libbrasero-burn/brasero-image-type-chooser.c |   19 +++++++++++++------
 libbrasero-burn/brasero-image-type-chooser.h |    2 +-
 plugins/cdrkit/burn-wodim.c                  |   18 ++++++++++++++++--
 plugins/cdrtools/burn-cdrecord.c             |   17 ++++++++++++++++-
 5 files changed, 53 insertions(+), 13 deletions(-)