Merge from trunk
commitea2b370da2766fed12db4e7c0f33ddce12f9d0b4
authorJan Djärv <jan.h.d@swipnet.se>
Wed, 6 Jan 2010 16:04:19 +0000 (6 17:04 +0100)
committerJan Djärv <jan.h.d@swipnet.se>
Wed, 6 Jan 2010 16:04:19 +0000 (6 17:04 +0100)
treeb0375aa9fa396b72afeee557cd8fae59149e3e85
parent4270727858c1c03f9df591c2fdfa0b9c3993348c
parent4f6fc2522762546ef55e4769863a31afc068756c
Merge from trunk