Binary: merge

hciattach ceph_test_rados_api_pool r.univar im-chooser myisam_ftdump pmie glsl-lod-bias qdbusxml2cpp spectra_manipulation.x_openmpi restoreconfig amavisd-new asciiview i586-linux-gnu-c++filt check_postgres_query_runtime cmis-client hmine lua-create-gitbuildpackage-layout gcc-ar-4.8 gmerlin_launcher javaws license lu-sh testMPEG4VideoStreamer srp-gen gil2bin otrs.AddGroup.pl shared_phylotypes.py packxxk cofactors.txt crypt_passwd.pl