Merge branch 'bondflip'

Samo Penic

2012-07-10 737e1c8236e7e9b72cf08c5d173e0a307c38600c

/usr/share/automake-1.11/install-sh does not exist in tree d3ee7bcac86c49b72e3fe726be71fb1f1344e6e6