Merge remote-tracking branch 'origin/master'
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 29 Jun 2012 08:36:31 +0000 (10:36 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 29 Jun 2012 08:36:31 +0000 (10:36 +0200)

Trivial merge