# HG changeset patch
# User Tero Marttila <terom@fixme.fi>
# Date 1410697498 -10800
# Node ID 4e6e067b3472c9f81b356121333f471037dc3425
# Parent  305f6d5904405c92dfed4f6dcc276ad5a6807688# Parent  aaae02944832630608158a4ba2ca96172cec257c
merge