tree e72d346172a30bbee165d7f585784724906da416
parent dd1d3a49db4ae5c6afffadaff526b96c7993c7dd
parent d4cfa4d12f46e2520f4c1d1a92e891ce068b7464
author Takashi Iwai <tiwai@suse.de> 1286797522 +0200
committer Takashi Iwai <tiwai@suse.de> 1286797522 +0200

Merge branch 'fix/misc' into topic/misc