Merge branch 'topic/jack' into topic/docbook-fix
authorTakashi Iwai <tiwai@suse.de>
Mon, 9 Mar 2009 14:21:51 +0000 (15:21 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 9 Mar 2009 14:21:51 +0000 (15:21 +0100)
commit33dbe6114047496a5b6fee0941c52dad41250043
tree74f84bc9658f4e72a22e89429aedbe49fdc13db4
parentb1a0aac05f044e78a589bfd7a9e2334aa640eb45
parent662c319ae4b4fb60001816dfe1dde5fdfc7a2af9
Merge branch 'topic/jack' into topic/docbook-fix