Merge from trunk
authorJan Djärv <jan.h.d@swipnet.se>
Wed, 6 Jan 2010 19:42:27 +0000 (20:42 +0100)
committerJan Djärv <jan.h.d@swipnet.se>
Wed, 6 Jan 2010 19:42:27 +0000 (20:42 +0100)
commit32d59dc3dbdc16c25f1f78659d3167c8f9670868
treec92352daa9417590a0c6a014d42c0f979b79f23f
parentb7f8e4f578f593257542d7d05daf7f634e0bdecb
parent474217c83c8a8e07a996ff621ea59f4f472dc340
Merge from trunk
src/ChangeLog