Merge branch 'jasa'
authorJan Lapinkataja <jan.lapinkataja@ixonos.com>
Wed, 20 May 2009 11:52:16 +0000 (14:52 +0300)
committerJan Lapinkataja <jan.lapinkataja@ixonos.com>
Wed, 20 May 2009 11:52:16 +0000 (14:52 +0300)
commit2fee8a8f52f449dd162bd1ece6c71dd3a460df1d
tree5d907580d79fa6eed3deab53bfd42d9868d95b41
parentf3338cdb2e117f0809a682eea7613c6e4a2ae199
parenta58a54b0935c2098c1aadb70f75ac5f420c74769
Merge branch 'jasa'