Merge branch 'master', remote-tracking branch 'origin'
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 11 Jul 2012 16:47:27 +0000 (18:47 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 11 Jul 2012 16:47:27 +0000 (18:47 +0200)

Trivial merge