Merge branch 'glibc-upgrade' into amavisd-update
authorGerd von Egidy <gerd.von.egidy@intra2net.com>
Wed, 27 Jan 2010 16:21:27 +0000 (17:21 +0100)
committerGerd von Egidy <gerd.von.egidy@intra2net.com>
Wed, 27 Jan 2010 16:21:27 +0000 (17:21 +0100)
commit42cfff480ff1f406f17d8e86e842ad31574d6ee5
treea861bb9c2c511f874ea4a28d183d67397eb05f05
parent8d9dd22717a791863b052a8e66a89cd288b87f1d
parent9e16d607c0b4e5ff1f1b7fc9b9013007e78be7ed
Merge branch 'glibc-upgrade' into amavisd-update

Conflicts:
packages/autoconf/autoconf.spec
packages/python/python.spec
packages/sqlite/sqlite.spec