Merge commit 'git-svn'
authorKeith Packard <keithp@keithp.com>
Fri, 1 May 2009 19:48:46 +0000 (12:48 -0700)
committerKeith Packard <keithp@keithp.com>
Fri, 1 May 2009 19:48:46 +0000 (12:48 -0700)
Conflicts:
src/SDCCast.c


Trivial merge