# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1262872447 -28800
# Node ID fb234c5a45edac07192e8aecbb8d9e0727b9c232
# Parent  664aa528b94ce2757784ab7ebda22fb863530aec# Parent  0865d6c0506d156e05abafe5401b3b2b4965562e
Merge from trunk