Merge branch 'genete_device_settings'
authorCarlos Lopez <genetita@gmail.com>
Fri, 12 Mar 2010 17:10:33 +0000 (18:10 +0100)
committerCarlos Lopez <genetita@gmail.com>
Fri, 12 Mar 2010 17:10:33 +0000 (18:10 +0100)

Trivial merge