Merge branch 'master' into crash_fixes
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 11 Jan 2013 17:44:47 +0000 (18:44 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 11 Jan 2013 17:44:47 +0000 (18:44 +0100)

Trivial merge