Merge branch 'master' into new_info_panels
authorKaj Wallin <kaj.wallin@ixonos.com>
Mon, 17 May 2010 05:47:11 +0000 (08:47 +0300)
committerKaj Wallin <kaj.wallin@ixonos.com>
Mon, 17 May 2010 05:47:11 +0000 (08:47 +0300)

Trivial merge