# HG changeset patch # User Karn Kallio # Date 1309720166 16200 # Node ID ac1f1d44560ddf7da1924555aeee813b1289e24f # Parent 71097b74400ea5894f39ae8ddc28796a322dcb6b# Parent f8c9e1e4d3375fd8f894e124e0947b6822dd24b3 Merge from upstream.