Merge branch 'master' of github.com:dpavlin/android-command-line
authorDobrica Pavlinusic <dpavlin@rot13.org>
Fri, 5 Oct 2012 12:59:52 +0000 (14:59 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Fri, 5 Oct 2012 12:59:52 +0000 (14:59 +0200)

Trivial merge