[erlang/f14/master: 4/4] Merge branch 'master' into f14/master

[Peter Lemenkov]

commit 7933a36ae95ac016a82f1ad592023b7b99466a12
Merge: 9e530ab f2a8e11
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Nov 11 15:52:40 2010 +0300

    Merge branch 'master' into f14/master
    
    Conflicts:
    	erlang.spec

 erlang.spec |   62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 61 insertions(+), 1 deletions(-)
---