Merge branch 'ehofman/sound'

author Tim Moore <timoore@redhat.com>

Wed, 13 Jan 2010 06:30:52 +0000 (07:30 +0100)

committer Tim Moore <timoore@redhat.com>

Wed, 13 Jan 2010 06:30:52 +0000 (07:30 +0100)
author Tim Moore <timoore@redhat.com>
Wed, 13 Jan 2010 06:30:52 +0000 (07:30 +0100)
committer Tim Moore <timoore@redhat.com>
Wed, 13 Jan 2010 06:30:52 +0000 (07:30 +0100)
diff --cc src/Main/fg_init.cxx
Simple merge
diff --cc src/Main/main.cxx
Simple merge
diff --cc src/Main/options.cxx
Simple merge
author	Tim Moore <timoore@redhat.com>
	Wed, 13 Jan 2010 06:30:52 +0000 (07:30 +0100)
committer	Tim Moore <timoore@redhat.com>
	Wed, 13 Jan 2010 06:30:52 +0000 (07:30 +0100)
		1	2
src/Main/fg_init.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
src/Main/main.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
src/Main/options.cxx	patch \|	diff1 \|	diff2 \|	blob \| history