Merge from mainline.
authorJan Djärv <jan.h.d@swipnet.se>
Tue, 5 Jan 2010 14:42:39 +0000 (15:42 +0100)
committerJan Djärv <jan.h.d@swipnet.se>
Tue, 5 Jan 2010 14:42:39 +0000 (15:42 +0100)
commit2889df585ae164ccf8fc57ffdbb432dfcd75e870
tree2fbd5bb635987af59cb98761f389b8d3747e8752
parent451f23ab90cbbd98de861ed8dff0bd4ffdda3bdf
parent03f77f0a4470c967d6f4351d347ebedd8fb882bb
Merge from mainline.
src/ChangeLog