Merge from trunk
commit269cf0db805913fdebe9ee78138b8e886624af7f
authorJan D. <jan.h.d@swipnet.se>
Wed, 6 Jan 2010 16:04:19 +0000 (6 17:04 +0100)
committerJan D. <jan.h.d@swipnet.se>
Wed, 6 Jan 2010 16:04:19 +0000 (6 17:04 +0100)
tree5148bee6ea723899b4a83a77480e9c0d4237bdd9
parent0e5c62a256329f16e39b6485b4177b7efcbd43ce
parentb30697f15f787d05dab83da5126d37e4f33419ab
Merge from trunk