Merge the changes in the javatalks.org repository of jcommune.