Merge branch 'localization'
authorKaj Wallin <kaj.wallin@ixonos.com>
Mon, 7 Jun 2010 06:40:39 +0000 (09:40 +0300)
committerKaj Wallin <kaj.wallin@ixonos.com>
Mon, 7 Jun 2010 06:40:39 +0000 (09:40 +0300)
commit034a9aaf302969fe3fc475b1c011a67c271c2377
tree71e76a293bffaedeb834c9bf87cd13cc164f629a
parent4cfe6a31ab1b6b76baa085421350c96cd996c81a
parent10e9ee80b23178e570212752d4493369fa2c5695
Merge branch 'localization'