Merge svn change r30908
commit3c2d6d9a8e28900300d20830c309eea2d511cfc8
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Mon, 26 Apr 2010 14:00:52 +0000 (26 17:00 +0300)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Mon, 26 Apr 2010 14:00:52 +0000 (26 17:00 +0300)
tree2acb147c37c113aa94227071f8981a297df11f23
parentff559b8e90c343eb465400d77fe8881eff09c6e3
parent2c099abea93ea2bae977ec0cd19dab91792a5aa9
Merge svn change r30908
mencoder.c