merged from default
merged from default

--HG--
branch : matlab-extract

stuarteberg/vigra,stuarteberg/vigra,hmeine/vigra,capturePointer/vigra,capturePointer/vigra,dagophil/vigra,dagophil/vigra,xiwei-zhang/vigra,martinsch/vigra,martinsch/vigra,psteinb/vigra,stuarteberg/vigra,ThomasWalter/vigra,dstoe/vigra,kod3r/vigra,xiwei-zhang/vigra,dagophil/vigra,cha007/vigra,mmuellner/vigra,hmeine/vigra,funkey/vigra,ThomasWalter/vigra,kod3r/vigra,mmuellner/vigra,xiwei-zhang/vigra,kod3r/vigra,psteinb/vigra,dagophil/vigra,ThomasWalter/vigra,cbecker/vigra,cha007/vigra,hmeine/vigra,cha007/vigra,dagophil/vigra,xiwei-zhang/vigra,psteinb/vigra,DaveRichmond-/vigra,DaveRichmond-/vigra,cbecker/vigra,psteinb/vigra,funkey/vigra,capturePointer/vigra,dagophil/vigra,funkey/vigra,cbecker/vigra,dstoe/vigra,dstoe/vigra,hmeine/vigra,DaveRichmond-/vigra,capturePointer/vigra,funkey/vigra,cha007/vigra,funkey/vigra,timoMa/vigra,ThomasWalter/vigra,kod3r/vigra,DaveRichmond-/vigra,ThomasWalter/vigra,dagophil/vigra,dstoe/vigra,cbecker/vigra,kod3r/vigra,funkey/vigra,kod3r/vigra,DaveRichmond-/vigra,martinsch/vigra,capturePointer/vigra,timoMa/vigra,capturePointer/vigra,capturePointer/vigra,stuarteberg/vigra,DaveRichmond-/vigra,hmeine/vigra,dstoe/vigra,martinsch/vigra,xiwei-zhang/vigra,hmeine/vigra,psteinb/vigra,stuarteberg/vigra,mmuellner/vigra,xiwei-zhang/vigra,psteinb/vigra,cha007/vigra,martinsch/vigra,stuarteberg/vigra,timoMa/vigra,ThomasWalter/vigra,mmuellner/vigra,cha007/vigra,cha007/vigra,stuarteberg/vigra,cbecker/vigra,ThomasWalter/vigra,hmeine/vigra,mmuellner/vigra,martinsch/vigra,xiwei-zhang/vigra,cbecker/vigra,psteinb/vigra,dstoe/vigra,timoMa/vigra,timoMa/vigra,dstoe/vigra,kod3r/vigra,mmuellner/vigra,funkey/vigra,mmuellner/vigra,DaveRichmond-/vigra,timoMa/vigra,timoMa/vigra