# HG changeset patch
# User Pat Downey <patd@symbian.org>
# Date 1277375251 -3600
# Node ID 8e58c1bec439e23ccba5224f5cc01ef63d206902
# Parent  1f16ecef041d5ff96ad1993cfb1b733ac89cec33# Parent  d9c0c077fd9e1bc6126e044ce0c6c430b77a3aaa
Merge heads.

diff -r 1f16ecef041d -r 8e58c1bec439 networkprotocolmodules/common/group/bld.inf
diff -r 1f16ecef041d -r 8e58c1bec439 networkprotocolmodules/suplcontrolplaneprotocols/common/group/bld.inf