[vlc-devel] commit: Merge commit 'origin/1.0-bugfix' (Laurent Aimar )

[git version control]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sat May 16 01:09:40 2009 +0200| [89b6530d8abd99b96b9f33af022022241fe97ee2] | committer: Laurent Aimar 

Merge commit 'origin/1.0-bugfix'

Conflicts:

	modules/codec/dmo/dmo.c

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=89b6530d8abd99b96b9f33af022022241fe97ee2
---