Merge commit 'origin/master' into fedora/master
commitcae1d96323ba59248eaa9eedcffb6fac7e35a8cc
authorAndreas Schwab <schwab@redhat.com>
Thu, 23 Jul 2009 16:35:00 +0000 (23 18:35 +0200)
committerAndreas Schwab <schwab@redhat.com>
Thu, 23 Jul 2009 16:35:00 +0000 (23 18:35 +0200)
treed24a2c26ec9c0d70d0a52c0a35de786058854984
parentd4192d9bce9e44adb2da4f2141713df9b335052f
parent9b6bf8a30292288c9536efb72d80020f189bf9a6
Merge commit 'origin/master' into fedora/master

Conflicts:
ChangeLog
ChangeLog