Merge from trunk
commit03f962ff30327b1a630e8409bb1f6422455bfcf4
authorJan D. <jan.h.d@swipnet.se>
Sun, 28 Feb 2010 10:41:52 +0000 (28 11:41 +0100)
committerJan D. <jan.h.d@swipnet.se>
Sun, 28 Feb 2010 10:41:52 +0000 (28 11:41 +0100)
treed39d19720e93eac68ae412844a9ee46fd5ed27a3
parentd27b189182eb87a023928a90695c375662a30a2a
parent176085261747a4a00d8e5d823886819b33fc52bf
Merge from trunk