[erlang-etap/f12/master: 6/6] Merge branch 'master' into f12/master

[Peter Lemenkov]

commit 20da6efcc7cc56875894cc011d2f9c989a092f90
Merge: 61e8e25 875b149
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Fri Oct 22 14:09:41 2010 +0400

    Merge branch 'master' into f12/master
    
    Conflicts:
    	.gitignore
    	erlang-etap.spec

 .gitignore                                         |    1 +
 ...0001-No-such-function-os-getenv-1-in-R11B.patch |   46 +++++++++
 ...un-arity-functions-missing-in-R11B-are-re.patch |  102 ++++++++++++++++++++
 ...g-etap-0003-Add-missing-right-parenthesis.patch |   23 +++++
 erlang-etap.spec                                   |   48 +++++++---
 5 files changed, 205 insertions(+), 15 deletions(-)
---