# HG changeset patch
# User Mark Brand <mabrand@mabrand.nl>
# Date 1348130586 -7200
# Node ID d733a98b84d6387bbf729d12dae21d32d6d54b65
# Parent  851daf6da276176063d24a0fa32dac2afb86d696# Parent  1d1285b1f6a0e72ca3d736f0a5a0a410f72ecb94
Merge branch 'stable'

Conflicts:
	src/qt-1-cherrypicks.patch

diff -r 851daf6da276 -r d733a98b84d6 src/qt-1-cherrypicks.patch