# HG changeset patch # User Pat Downey # Date 1277310138 -3600 # Node ID 2f67eb14d00307c1d9d477f0b4f38a77fbfcb75f # Parent 51d10d255e92a00a4de11fda8a18b7fcd82acff6# Parent 6396153a6cefdb870ba08633d7365749f8a9f71a Merge heads. diff -r 51d10d255e92 -r 2f67eb14d003 searchui/stateproviders/searchstateprovider/resources/delimeterscreen.docml diff -r 51d10d255e92 -r 2f67eb14d003 searchui/stateproviders/searchstateprovider/resources/searchstateprovider.docml