Merge branch 'master' into new_info_panels
authorKaj Wallin <kaj.wallin@ixonos.com>
Fri, 7 May 2010 05:54:10 +0000 (08:54 +0300)
committerKaj Wallin <kaj.wallin@ixonos.com>
Fri, 7 May 2010 05:54:10 +0000 (08:54 +0300)

Trivial merge