Merge svn changes up to r30068 (skip libass changes)

Mark inferior external libass support implementation from svn merged
with "-s ours" (no actual changes to the tree). This tree already
contains a better implementation.
This commit is contained in:
Uoti Urpala 2009-12-29 23:59:08 +02:00
commit 0f81e5f973

Diff Content Not Available