Merge branch 'master' into erlware
commit5d4e12ae85c90998d072802137d096bd39e18ffe
authormats cronqvist <mats.cronqvist@gmail.com>
Wed, 6 May 2009 11:58:05 +0000 (6 13:58 +0200)
committermats cronqvist <mats.cronqvist@gmail.com>
Wed, 6 May 2009 11:58:05 +0000 (6 13:58 +0200)
treebe5e267d61bcb6485e7ec6b6d461ad95a6c446d9
parent8fda0391f042174711f0ac76501ed3bf9feaa5a6
parent4e92e2fcb94b1665e54eafb948e6f1c662392358
Merge branch 'master' into erlware