Merge branch 'h5-ubuntu-danil' into h6-gentoo-danil
Merge branch 'h5-ubuntu-danil' into h6-gentoo-danil
ssh: add waveaccess-dima-medap
Merge branch 'h6-gentoo-danil' into h3-gentoo-danil

Conflicts:
	.config/Trolltech.conf
	.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml