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)
1  2 
src/ChangeLog

diff --cc src/ChangeLog
Simple merge