merge of '4c5dbb5e116d9a9c7f9014a3dcbabba8e7d89327'
authorRoland McGrath <roland@redhat.com>
Thu, 4 Dec 2008 06:28:06 +0000 (06:28 +0000)
committerRoland McGrath <roland@redhat.com>
Thu, 4 Dec 2008 06:28:06 +0000 (06:28 +0000)
commit12af5a2882bf23f3f2b55d78ef2ea568bac120de
tree686a3f6ae8733a2a7bafb73228aec88a02071098
parent02f66452635df3d01f7e57845c3362ab828e3d89
Merge ... '4c5dbb5e116d9a9c7f9014a3dcbabba8e7d89327'
     and 'fddaff07d3c095a3d26f41fe7a7da147c024bd96'
libasm/ChangeLog
libasm/Makefile.am