Merge from trunk
commit7a5a264fc27bde6870f08ecc5d85eddc36fa0336
authorJan Djärv <jan.h.d@swipnet.se>
Fri, 2 Apr 2010 09:45:27 +0000 (2 11:45 +0200)
committerJan Djärv <jan.h.d@swipnet.se>
Fri, 2 Apr 2010 09:45:27 +0000 (2 11:45 +0200)
tree54106d60bd5f2273821bb5e3fb73bebf31a5599e
parentd0b228766f1471ed104d2e038f63cd4627d79b57
parent9cb52861f287cbad4608a5fceddae5bac1a90ba6
Merge from trunk