Merge proposals dependent on lp:ubuntu/natty-security/language-pack-gnome-fa-base

1. Natty (11.04)
2. natty-security
3. Dependent merge proposals