# HG changeset patch
# User Sebastian Kruse <skruse@mpiwg-berlin.mpg.de>
# Date 1354813740 -3600
# Node ID 90b7bbc9962fb3cf1c4095411358f7f4ed95776c
# Parent  7c9aa2fdfa43bc1421c77814b4ca6c95cebe086e# Parent  ba7d401c2750a06c1e0e460ded0ec351a932fd13
Merged the bugfixes