# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1369898530 -7200
# Node ID de1740022f78d44db1da0bf1239a4b01bab68b97
# Parent  a3eaf3bb0cc9132862fc6d2ce2ae3fd0352c9a2b# Parent  6fd0ed97283f2839ffe35a638f4ec36960a7e9c8
merge from 21 release