Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 39718
This allows picking more upstreamed stuff Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 39467