# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1189207838 -10800
# Node ID fb270cb264d709e019981f3404416fefdf1123bc
# Parent  dbad02a89dc20cd83aa67702f570c5216e377f11# Parent  f62fc28b3e8451164aac95782d0f8574512084c9
Automated merge with ssh://hg.atheme.org//hg/audacious

diff -r dbad02a89dc2 -r fb270cb264d7 src/audacious/dock.c