merge 11347.

This commit is contained in:
Martin v. Löwis 2011-05-09 07:41:32 +02:00
commit 4e9da47d8f
4 changed files with 767 additions and 678 deletions

1428
configure vendored

File diff suppressed because it is too large Load diff