# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1322938007 -3600
# Node ID be126fe7c4e7b6d24d57ec8dcbf6d1e9ae915a46
# Parent  616cc6a5fd30eb1d297808b981c79b871a7c3214# Parent  7b36e40383772f5b464887bb09a310770a91c5ca
Merge with MattJ & mva