Merge remote-tracking branch 'origin/sync_review_2'
authorDavid A. Velasco <dvelasco@solidgear.es>
Thu, 6 Dec 2012 13:03:50 +0000 (14:03 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Thu, 6 Dec 2012 13:03:50 +0000 (14:03 +0100)

Trivial merge