Merge branch 'master' into localization
authorKaj Wallin <kaj.wallin@ixonos.com>
Thu, 3 Jun 2010 12:16:57 +0000 (15:16 +0300)
committerKaj Wallin <kaj.wallin@ixonos.com>
Thu, 3 Jun 2010 12:16:57 +0000 (15:16 +0300)

Trivial merge