Merge branch 'master' of git://github.com/haiku/haiku

Merge branch 'master' into pm-flat

Conflicts:
build/jam/HaikuImage
build/jam/OptionalBuildFeatures
build/jam/OptionalPackages
build/jam/UserBuildConfig.sample
data/bin/installoptionalpackage
s

Merge branch 'master' into pm-flat

Conflicts:
build/jam/HaikuImage
build/jam/OptionalBuildFeatures
build/jam/OptionalPackages
build/jam/UserBuildConfig.sample
data/bin/installoptionalpackage
src/apps/deskbar/DeskbarMenu.cpp
src/servers/debug/DebugServer.cpp
src/system/kernel/fs/vfs.cpp

show more ...

#7512: Localize mixer media add-on.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42967 a95241bf-73f2-0310-859d-f6bbb57e9c96