# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1263220487 -28800
# Node ID 3e16e7dbb4a541fbfd7280f17a9b1378eb504c8e
# Parent  50223db834f23304243d6ef0ac4381c50e049800# Parent  f039ef236594c44cd7032976fd2382b6b09bdf5e
Merge from trunk