[tor-commits] [torbrowser/master] Merge branches 'windows-maint-2.2' and 'maint-2.2' into maint-2.2

commit 047c5a299f04084c041cc211d537c60e9f06d883 Author: Erinn Clark <erinn@torproject.org> Date: Fri Apr 22 16:55:29 2011 +0300 Merge branches 'windows-maint-2.2' and 'maint-2.2' into maint-2.2