Merge branch 'topic/beep-rename' into topic/core-change
authorTakashi Iwai <tiwai@suse.de>
Tue, 1 Dec 2009 14:58:10 +0000 (15:58 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 1 Dec 2009 14:58:10 +0000 (15:58 +0100)

Trivial merge