Merge svn changes up to r30068 (skip libass changes)
commit0f81e5f9732d143ab47c9b03dfd528f3a0af4aea
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 29 Dec 2009 21:59:08 +0000 (29 23:59 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 29 Dec 2009 22:03:48 +0000 (30 00:03 +0200)
treed68ea94ae2d712cb2e991496049bc13f19d9ea60
parent67b40bd21988fed2f70b1c4f5aea301b28f78298
parentbfd01bdc1700bac53392dc827f3f7870124d0406
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.