# HG changeset patch
# User teknolog
# Date 1272538532 -3600
# Node ID 70749e2f572d55912e61b0698c1330d3e9d560f5
# Parent  3d36a7fc21318846499e660ad0375757eaceea44# Parent  3c0683f9f72ca03a7f6979e055cd1e271fcb748c
merge

diff -r 3d36a7fc2131 -r 70749e2f572d application/data/PodcastClient_english.rls
diff -r 3d36a7fc2131 -r 70749e2f572d application/group/Podcast.mmp
diff -r 3d36a7fc2131 -r 70749e2f572d application/src/PodcastAppui.cpp
diff -r 3d36a7fc2131 -r 70749e2f572d application/src/PodcastFeedView.cpp
diff -r 3d36a7fc2131 -r 70749e2f572d application/src/PodcastSearchView.cpp
diff -r 3d36a7fc2131 -r 70749e2f572d engine/inc/ConnectionEngine.h
diff -r 3d36a7fc2131 -r 70749e2f572d group/bld.inf