Merge from trunk
commit85a23ea6075bcf630d93dfd2dba3811e263e05d1
authorJan D. <jan.h.d@swipnet.se>
Wed, 24 Feb 2010 18:10:47 +0000 (24 19:10 +0100)
committerJan D. <jan.h.d@swipnet.se>
Wed, 24 Feb 2010 18:10:47 +0000 (24 19:10 +0100)
tree7f79486999fcc5ee68141ecff9975f4e3e3b729c
parentc2b8bcd162c719b7e9ba2e19c92fdbb95f274355
parent7f24ccf5162e023e9466a9319f786f55f54b36fd
Merge from trunk