[packages_10.03.2] pcmciautils: merge r29199