Merge branch 'dhewg'
commit153a0f69db7bae38a0ca4e719e9a8182ea7bcf0b
authordhewg <dhewg@wiibrew.org>
Sat, 14 Feb 2009 12:37:10 +0000 (14 13:37 +0100)
committerdhewg <dhewg@wiibrew.org>
Sat, 14 Feb 2009 12:37:10 +0000 (14 13:37 +0100)
tree020b2dba952a0d91eedb26fa479258e0ee5d5584
parentc42b2430a3091360648ce6be53ca38a5ffc98a33
parent66866794ac398639c4cbaaed7e68db5be3c4081f
Merge branch 'dhewg'

Conflicts:
libtinysmb/smb.c
libtinysmb/smb_devoptab.c