[no commit message]
Merge branch 'master' of hg::https://code.google.com/p/flist-pidgin