Merge branch 'c11'
authorUlrich Drepper <drepper@gmail.com>
Tue, 3 Jan 2012 12:54:34 +0000 (07:54 -0500)
committerUlrich Drepper <drepper@gmail.com>
Tue, 3 Jan 2012 12:54:34 +0000 (07:54 -0500)
1  2 
ChangeLog

diff --cc ChangeLog
Simple merge