pidgin/android/android

pidgin/android/android/
Patch up merge

2011-08-11, Ethan Blanton
7286419deb7e