Merge branch 'own_location'
authorVille Tiensuu <ville.tiensuu@ixonos.com>
Tue, 4 May 2010 05:28:58 +0000 (08:28 +0300)
committerVille Tiensuu <ville.tiensuu@ixonos.com>
Tue, 4 May 2010 05:28:58 +0000 (08:28 +0300)
commitcd62e49a34a03a1296ff0353c011d8389af82abc
treea92f10fee77878d86557b86cae29275d8d21410e
parent389d6e1a6cce2647cbb654c47713d0ecf3115af7
parentea1e2d80095310d71525415066aaaf0a25b341f3
Merge branch 'own_location'