[vlc-devel] commit: Merge branch '1.0-bugfix' ( Rémi Duraffort )

[git version control]

vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Wed May 20 21:53:35 2009 +0200| [78d87996ccb92d1dc91c9987685f976ed3be08a6] | committer: Rémi Duraffort 

Merge branch '1.0-bugfix'

Conflicts:

	src/control/media_player.c

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