Merge branch 'own_location' into integration
authorKaj Wallin <kaj.wallin@ixonos.com>
Mon, 3 May 2010 11:44:00 +0000 (14:44 +0300)
committerKaj Wallin <kaj.wallin@ixonos.com>
Mon, 3 May 2010 11:44:00 +0000 (14:44 +0300)
commit279f932062f78ffc2dff812b441807952e37b869
tree4f496d6ee9de0627601265564241b80a4ed2a238
parentd13c207f0754f5a1311aeb0ee130311a99380ef7
parentc9aea404e0bba5bef6c9b64f48aa475fc94b8d2b
Merge branch 'own_location' into integration