From: Andre Noll <maan@systemlinux.org>
Date: Sat, 25 Apr 2009 20:33:43 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v0.3.5~61^2~7
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=b27f3e8dd53af7209626a9f0e98eb4770602c2e7

Merge branch 'master' into next

Conflicts:
	mp3_afh.c
---

b27f3e8dd53af7209626a9f0e98eb4770602c2e7