# HG changeset patch
# User Yoshiki Yazawa <yaz@cc.rim.or.jp>
# Date 1195389964 -32400
# Node ID ec1ff3169025c3ef9000543f1bc61e3b331f8f5b
# Parent  a4387938cc7d9d0041ad19845112804690fb3ea7# Parent  e31befc7f7c46ff3993b8dc4570d54c391cccdc8
branch merge