Merge branch 'stable' into stable-master-merge
authorKarl Hasselström <kha@treskal.com>
Mon, 14 Apr 2008 23:18:35 +0000 (01:18 +0200)
committerKarl Hasselström <kha@treskal.com>
Mon, 14 Apr 2008 23:18:35 +0000 (01:18 +0200)
commit1eae3bf5ef8561508d83845f27b61c7533ba3378
tree9bdaa18e7f349eee78753e8256358d90b727c749
parent719309aa54c8fa43bd8700f09b1e293923ed4e0a
parent943b9c1a483467ffa317f729a1b7408b52b0b218
Merge branch 'stable' into stable-master-merge