Merge branch 'master' of git://valera-ext.nynaeve.net/silc
authorSkywing <skywing@valhallalegends.com>
Sat, 22 Nov 2008 00:38:40 +0000 (19:38 -0500)
committerSkywing <skywing@valhallalegends.com>
Sat, 22 Nov 2008 00:38:40 +0000 (19:38 -0500)

Trivial merge