tree b5bba9600470f8a5e417519b7c2d5fd13d079c3b
parent bc3a8a01def4fb0ec0ef8a20d097277b9c6b2a1f
parent 382225e62bdb8059b7f915b133426425516dd300
author Takashi Iwai <tiwai@suse.de> 1299851289 +0100
committer Takashi Iwai <tiwai@suse.de> 1299851289 +0100

Merge branch 'fix/misc' into topic/misc