Merge branch 'jasa'
authorJan Lapinkataja <jan.lapinkataja@ixonos.com>
Thu, 28 May 2009 09:26:29 +0000 (12:26 +0300)
committerJan Lapinkataja <jan.lapinkataja@ixonos.com>
Thu, 28 May 2009 09:26:29 +0000 (12:26 +0300)
commitfe81ee95cd3d2341c0fb4b45add15d4d07d30f53
tree5a2675eedc9da8e7303b10d83f94c14a4560506b
parent514c30e1dda23655507cd676f05d90400d1add87
parentb590c3398df1f43323753e222ce78b8b57de5264
Merge branch 'jasa'