Merge branch 'release-1.4.1' oc-android-1.4.1
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 26 Jun 2013 16:10:10 +0000 (18:10 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 26 Jun 2013 16:10:10 +0000 (18:10 +0200)

Trivial merge