Merge branch 'topic/jack' into topic/docbook-fix
Takashi Iwai [Mon, 9 Mar 2009 14:21:51 +0000 (15:21 +0100)]

Trivial merge