# HG changeset patch
# User pbhat
# Date 1373036442 14400
# Node ID 5689e9667f63cca8dc404a9d01ffb9a72e7caffb
# Parent  5feb4a9e268053f450f37cf1877059df2f7824dc# Parent  bd5729857936318d4f4f9c9b310ddbaf0303b9cb
Merge

diff -r 5feb4a9e2680 -r 5689e9667f63 common/autoconf/generated-configure.sh