Merge branch 'master' into next
authorAndre Noll <maan@systemlinux.org>
Sat, 25 Apr 2009 20:33:43 +0000 (22:33 +0200)
committerAndre Noll <maan@systemlinux.org>
Sat, 25 Apr 2009 20:33:43 +0000 (22:33 +0200)
commitb27f3e8dd53af7209626a9f0e98eb4770602c2e7
tree3e72b6e43a506933219965790db8ad3b9884af8b
parenta7f31bd369e5eda15361bef5aee2529bdb6eb89e
parent1c4fca3000b98973a433bfd80290d159fd6696a7
Merge branch 'master' into next

Conflicts:
mp3_afh.c
error.h