modifications for latest eclipse android ish...
Merge remote-tracking branch 'github/master'