From dd6de226a817f20ac22875d337835b538c12a281 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Thu, 25 Aug 2011 12:49:26 +0200
Subject: [PATCH] Merge branch 'master' into 0.11

Conflicts:
	ext/resindvd/rsnwrappedbuffer.c