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

[Peter Lemenkov]

commit 888a137b82eea138331a720addd16f519e41a144
Merge: 3f9a800 f6c950e
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sun Nov 21 10:14:03 2010 +0300

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

 .gitignore                                         |    2 +
 erlang.spec                                        |   38 +++++++-----
 ...at-man-pages-and-do-not-install-miscellan.patch |    4 +-
 otp-0002-Remove-rpath.patch                        |    4 +-
 otp-0004-Fix-for-dlopening-libGL-and-libGLU.patch  |    4 +-
 otp-0005-Do-not-install-C-sources.patch            |    4 +-
 otp-0006-Do-not-install-Java-sources.patch         |    4 +-
 ...all-info-files-they-are-almost-empty-and-.patch |    4 +-
 ...all-nteventlog-and-related-doc-files-on-n.patch |    4 +-
 ...-install-.bat-files-on-non-win32-machines.patch |    4 +-
 ...0010-Do-not-install-VxWorks-specific-docs.patch |    4 +-
 otp-0011-Do-not-install-erlang-sources.patch       |    4 +-
 otp-0012-Fix-installation-of-example-file.patch    |    4 +-
 ...ound-for-java-1.5.0-gcj-which-doesn-t-sup.patch |   63 ++++++++++++++++++++
 sources                                            |    2 +
 15 files changed, 111 insertions(+), 38 deletions(-)
---