Merge from trunk
commit433bdc96cb7234e36f218df1588b17411f54ee57
authorJan Djärv <jan.h.d@swipnet.se>
Mon, 25 Jan 2010 07:45:12 +0000 (25 08:45 +0100)
committerJan Djärv <jan.h.d@swipnet.se>
Mon, 25 Jan 2010 07:45:12 +0000 (25 08:45 +0100)
tree999e53f70ecf6ed72cbd49567d6eddb03ec9e873
parentaa3e13b5300d55ee22fbd548f0284beb0c65a871
parent755da7fa2086d39e2f07262ff13e8ff015edbc7e
Merge from trunk
src/ChangeLog