Merge svn changes up to r30108 (with "-s ours")
commita06b32b64e91082c11f747e2910f10a4afd3dfa9
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 29 Dec 2009 22:18:58 +0000 (30 00:18 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 29 Dec 2009 22:19:01 +0000 (30 00:19 +0200)
tree3028341d6fd07c19b8b7c78fdfd7c411cbdce573
parentdc7f1830224e1953fb07ffcc045735b2b15af310
parenta3e355babf48e2c86652883cdb20e8fee5529276
Merge svn changes up to r30108 (with "-s ours")

Skip more inferior external-libass support changes from svn.