# HG changeset patch
# User Henrik Stuart <hg@hstuart.dk>
# Date 2010-07-14 17:44:49
# Node ID f4b03295b1d9dfe9f499a9f3c6a48414b3165e29
# Parent  724362365ea0b8dae1f3fdf19d1221d4f80b372e
# Parent  164eb14a4a7c8fac2967c21dded1ae5c3c5d17e1

merge with stable