Merge remote-tracking branch 'remotes/newdev/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Mar 2011 17:55:51 +0000 (18:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Mar 2011 18:24:42 +0000 (19:24 +0100)
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge