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

Trivial merge