[vlc-devel] commit: Merge branch 1.0-bugfix into master ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat May 23 17:01:32 2009 +0300| [152b1687c0ec112f3ab1360006d048d6b9cf7258] | committer: Rémi Denis-Courmont 

Merge branch 1.0-bugfix into master

Conflicts:
	modules/video_output/drawable.c
	src/control/libvlc_internal.h

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