Merge branch 'origin'
authorScott Wood <scott@buserror.net>
Wed, 4 Jul 2007 01:33:58 +0000 (20:33 -0500)
committerScott Wood <scott@buserror.net>
Wed, 4 Jul 2007 01:33:58 +0000 (20:33 -0500)
commit15d9baeca05f30f8564785c255fed765ede457ff
tree556450eea6ff48bbeb9bdb9b771cf1fbdcd1541e
parentb5cbe98949d5b279965d607c9618d404b26d4760
parent162bcbe20500026d447471ea289485cc94fcef05
Merge branch 'origin'

Conflicts:

lib/c++/orb.cc
lib/c++/orb.cc