Merge from trunk
authorJan Djärv <jan.h.d@swipnet.se>
Tue, 19 Jan 2010 14:54:57 +0000 (15:54 +0100)
committerJan Djärv <jan.h.d@swipnet.se>
Tue, 19 Jan 2010 14:54:57 +0000 (15:54 +0100)
commitbc4b76f12a306f8fbc892e6f1e00733f3ef1981f
treeed117f27318a9e295e7df84bf5e3d40a4ce2ff6c
parent67477f30cb0f563fe124decf9391af4a980c7bfb
parenteeff0f485929b225f9b302e5957a654f4a367305
Merge from trunk
src/ChangeLog