Merge branch 'stable' into stable-master-merge
authorKarl Hasselström <kha@treskal.com>
Sun, 29 Jun 2008 22:47:50 +0000 (00:47 +0200)
committerKarl Hasselström <kha@treskal.com>
Sun, 29 Jun 2008 22:47:50 +0000 (00:47 +0200)
commita05954efcf4fce744252ce2e1a650b78fa5788d6
tree0eccebad07ee6d7b90672334330e2103ec947f70
parent354d203152c0fda8e0221aff9fdfa9b18d53e83d
parentcd65a83bcf40b7c991b359099d9a9a894ae7a696
Merge branch 'stable' into stable-master-merge