Merge commit 'origin/svn-head' into dhewg
commit66866794ac398639c4cbaaed7e68db5be3c4081f
authordhewg <dhewg@wiibrew.org>
Sat, 14 Feb 2009 08:28:56 +0000 (14 09:28 +0100)
committerdhewg <dhewg@wiibrew.org>
Sat, 14 Feb 2009 08:28:56 +0000 (14 09:28 +0100)
tree020b2dba952a0d91eedb26fa479258e0ee5d5584
parent94edf4c9ca6f4b43f0cb61a003be7a8d80247ec2
parentc0c14fd9252b35ba2d205e627c3d264b7009c6e2
Merge commit 'origin/svn-head' into dhewg

Conflicts:
libdb/debug.c
gc/network.h