# HG changeset patch
# User Etan Reisner <pidgin@unreliablesource.net>
# Date 1246806712 0
# Node ID d137b369eb9c5de2237ec4f42fe98eed04ae8f8a
# Parent  69511e7817170bffd72d7a9ef07f1627881a77ef# Parent  b6e94a044a0f05afc95a2b562196582b0c5d533c
merge of '0c046bad9fd4d69c10aa296f24460f584920431d'
     and 'e4af1914033e4084f4fd52bc5d08d1ce48ed0c8d'

diff -r 69511e781717 -r d137b369eb9c ChangeLog