[thomas]Merge during last commit failed. Commiting good merge
[thomas]Merge during last commit failed. Commiting good merge


git-svn-id: ab66a9de07fa9d47c5829c82992f5279466c775f@3096 63c20433-aa62-49bd-875c-5a186b69a8fb

drakeguan/gpac,aymanelyaagoubi/gpac,canatella/gpac,DmitrySigaev/gpac,nguyen-viet-thanh-trung/gpac,RodolpheFouquet/gpac,rbouqueau/gpac,epam/gpac,nguyen-viet-thanh-trung/gpac,epam/gpac,psteinb/gpac,aymanelyaagoubi/gpac,gpac/gpac,ARSekkat/gpac,vladimir-kazakov/gpac,aymanelyaagoubi/gpac,nguyen-viet-thanh-trung/gpac,emmanouil/gpac,ARSekkat/gpac,rauf/gpac,psteinb/gpac,canatella/gpac,ARSekkat/gpac,nguyen-viet-thanh-trung/gpac,drakeguan/gpac,porcelijn/gpac,gpac/gpac,psteinb/gpac,rauf/gpac,RodolpheFouquet/gpac,Bevara/Access-open,ARSekkat/gpac,vladimir-kazakov/gpac,rauf/gpac,ARSekkat/gpac,DmitrySigaev/gpac,rbouqueau/gpac,rbouqueau/gpac,Bevara/Access-open,Bevara/Access-open,porcelijn/gpac,psteinb/gpac,RodolpheFouquet/gpac,porcelijn/gpac,emmanouil/gpac,psteinb/gpac,DmitrySigaev/gpac,rbouqueau/gpac_brew_travis,gpac/gpac,drakeguan/gpac,gpac/gpac,gpac/gpac,drakeguan/gpac,gpac/gpac,DmitrySigaev/gpac,drakeguan/gpac,rbouqueau/gpac,rbouqueau/gpac_brew_travis,rauf/gpac,RodolpheFouquet/gpac,rbouqueau/gpac,rbouqueau/gpac_brew_travis,canatella/gpac,aymanelyaagoubi/gpac,vladimir-kazakov/gpac,psteinb/gpac,rauf/gpac,ARSekkat/gpac,canatella/gpac,gpac/gpac,drakeguan/gpac,epam/gpac,nguyen-viet-thanh-trung/gpac,Bevara/Access-open,gpac/gpac,nguyen-viet-thanh-trung/gpac,emmanouil/gpac,vladimir-kazakov/gpac,porcelijn/gpac,canatella/gpac,emmanouil/gpac,vladimir-kazakov/gpac,rbouqueau/gpac,emmanouil/gpac,canatella/gpac,Bevara/Access-open,DmitrySigaev/gpac,RodolpheFouquet/gpac,canatella/gpac,Bevara/Access-open,aymanelyaagoubi/gpac,epam/gpac,DmitrySigaev/gpac,rbouqueau/gpac_brew_travis,epam/gpac,rbouqueau/gpac,rbouqueau/gpac,aymanelyaagoubi/gpac,rbouqueau/gpac_brew_travis,rbouqueau/gpac_brew_travis,RodolpheFouquet/gpac,emmanouil/gpac,epam/gpac,porcelijn/gpac,rauf/gpac,porcelijn/gpac,vladimir-kazakov/gpac