Merge branch 'master' of mercury.wipsl.com:/var/git/irwi

author Torste Aikio <zokier@zokier.laptop>

Thu, 8 Jul 2010 11:54:49 +0000 (14:54 +0300)

committer Torste Aikio <zokier@zokier.laptop>

Thu, 8 Jul 2010 11:54:49 +0000 (14:54 +0300)
author Torste Aikio <zokier@zokier.laptop>
Thu, 8 Jul 2010 11:54:49 +0000 (14:54 +0300)
committer Torste Aikio <zokier@zokier.laptop>
Thu, 8 Jul 2010 11:54:49 +0000 (14:54 +0300)
diff --cc src/selectremotedlg.cpp
Simple merge
diff --cc src/settingsdlg.cpp
Simple merge
author	Torste Aikio <zokier@zokier.laptop>
	Thu, 8 Jul 2010 11:54:49 +0000 (14:54 +0300)
committer	Torste Aikio <zokier@zokier.laptop>
	Thu, 8 Jul 2010 11:54:49 +0000 (14:54 +0300)
		1	2
src/selectremotedlg.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/settingsdlg.cpp	patch \|	diff1 \|	diff2 \|	blob \| history