# HG changeset patch
# User andrew.victor@mxit.com
# Date 1305490047 0
# Node ID 6ed15e063e58d331c4bf3518c2b28082c83082cf
# Parent  dff70c2930e8411c167c0cfdbc1d1218333d4438# Parent  45d3df336659d0a9b4233be1e0f5ef50b220ed6b
merge of '480053700827137374fa90746e7c0dbf6e4d1cd5'
     and 'f385f7fe1f2b01848baf809102442bed936ebf54'