Merge proposals dependent on lp://staging/~mirsal-ennaime/ubuntu/maverick/php-mcrypt/fix-mcrypt-ini-comments

1. Maverick (10.10)
2. fix-mcrypt-ini-comments
3. Dependent merge proposals