# HG changeset patch
# User koda
# Date 1326845469 -3600
# Node ID 51d5dd5464aa57610a9757292affefd47b0fba14
# Parent  6225b838a63030d8743cff907be53ebfd10063fb# Parent  9e49e6a8585bbc41227912c78d4f521074f65ff3
merge

diff -r 6225b838a630 -r 51d5dd5464aa QTfrontend/ui/page/pagemain.cpp