Merge commit 'origin/master'
commitfc5db2afbd64a37e7c454576568d9f232bfc921b
authorMagnus Henoch <magnus@erlang-consulting.com>
Mon, 14 Sep 2009 17:17:31 +0000 (14 18:17 +0100)
committerMagnus Henoch <magnus@erlang-consulting.com>
Mon, 14 Sep 2009 17:17:31 +0000 (14 18:17 +0100)
tree30a88ad4fcf91094336077afa91939d7ef1192b2
parent798c22370dd9a68b73148e0be453c15e019d09dc
parent5d68acde71714f0145ebdc6d96a15a0b7025b896
Merge commit 'origin/master'