tree 57200ef68bae530776c0c2621c51e9464e1e72f9
parent 33dbe6114047496a5b6fee0941c52dad41250043
parent 79c7cdd5441f5d3900c1632adcc8cd2bee35c8da
author Takashi Iwai <tiwai@suse.de> 1236608517 +0100
committer Takashi Iwai <tiwai@suse.de> 1236608517 +0100

Merge branch 'topic/vmaster-update' into topic/docbook-fix