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)
commit9c55fe8f4c9c3965e47a8ed49ba5c99e54a3eb3b
tree695076cef6e6e553d64f315d2254e7423e2c197e
parentffb0304593547dd31424d7df62de771b7c1d7719
parentfb61a7c5343a23d845ab73dd28caf6ec98cd6101
Merge remote-tracking branch 'remotes/newdev/master'

Merged-by: Michael Niedermayer <michaelni@gmx.at>