Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 25 Aug 2011 10:49:26 +0000 (12:49 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 25 Aug 2011 10:49:26 +0000 (12:49 +0200)
commitdd6de226a817f20ac22875d337835b538c12a281
treeaa54f5a6351ff37fff4089c50c8f5b1a4d922d79
parentdf00cae0be545210b2dbd7eeb39d9aaa0d741cb9
Merge branch 'master' into 0.11

Conflicts:
ext/resindvd/rsnwrappedbuffer.c