Merge remote-tracking branch 'origin/master' into long_press
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 31 Oct 2012 16:52:28 +0000 (17:52 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 31 Oct 2012 16:52:28 +0000 (17:52 +0100)

Trivial merge