tree dca7934b27d510c9c006558979ebc48e07a531cf
parent b21a8ee67013372f439fbd1591e91d09de49bb9c
parent c6b358748e19ce7e230b0926ac42696bc485a562
author Takashi Iwai <tiwai@suse.de> 1301310238 +0200
committer Takashi Iwai <tiwai@suse.de> 1301310238 +0200

Merge branch 'fix/misc' into topic/misc