[brasero: 5/5] Merge branch 'work2'

[Philippe Rouquier <philippr src gnome org>]

commit e4ee1e19861aed575d8bb0af6c39936e44887401
Merge: 095388a... 3d7b329...
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Sat May 23 17:50:43 2009 +0200

    Merge branch 'work2'

 libbrasero-burn/brasero-data-project.c |   21 ++++++++++++++++++---
 src/brasero-data-disc.c                |    1 -
 src/brasero-file-chooser.c             |   15 +++++++++++++++
 src/brasero-layout.c                   |    8 ++++----
 4 files changed, 37 insertions(+), 8 deletions(-)