tree 55a79839394c6edd254bdc06e9d815ce5a7bddd2
parent 5cbc876ef5a9ebe5d430d8616f049811d3ff3fbf
parent 31ef2e7a52647e34a37a94e7892be52f321dedf9
author paulbarker <paulbarker@localhost> 1190229538 -0000
committer paulbarker <paulbarker@localhost> 1190229538 -0000

Merged changes r1927-r1963 from the trunk into multiarch branch.

svn path=/branches/multiarch/; revision=1964