merge of '7bf39cf992a3dbe062066db3100333fa62967447'
authorErik Hovland <erik@hovland.org>
Tue, 22 Aug 2006 20:16:18 +0000 (20:16 +0000)
committerErik Hovland <erik@hovland.org>
Tue, 22 Aug 2006 20:16:18 +0000 (20:16 +0000)
commitff49b42aedb3c09f71cb35456140b9afcf6b40b8
tree8d9b9b1cf97af4ccb5d06964477056e4d51fb938
parent92415076b9a7601cec26eea72f9a6b6ac2ee848f
parent469410c81b3d651f54cbf399de4e8e8f139922f7
Merge ... '7bf39cf992a3dbe062066db3100333fa62967447'
     and 'd31705a022a5624d8e85880ced6f1e90daa6d840'
packages/glibc/glibc_2.3.5+cvs20050627.bb