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)
commit316106653aa2c6c7f11b8d3cc44e684a6ac62338
treec8e0a568f87c861dfa94751087351600d3f0ebb6
parent92abf3b25cde51ca18b7a502e10a12d8c127537e
parent14adefa833a64e276be14595f49b72660b771ddf
Merge branch 'master' into localization