Merge branch 'jasa'
authorJan Lapinkataja <jan.lapinkataja@ixonos.com>
Thu, 28 May 2009 06:57:35 +0000 (09:57 +0300)
committerJan Lapinkataja <jan.lapinkataja@ixonos.com>
Thu, 28 May 2009 06:57:35 +0000 (09:57 +0300)
commitfca396748c9e36ce4ba5e0cc4e4d220b266331d3
treedd3203128c31c2cc01c50709eb1b15c5637897c5
parent83a9dd48d2482f6418c3ee24ddc994b723a1ef9f
parentdb2aaed587113457247edd099aec5698efb20b15
Merge branch 'jasa'