Fri Apr 23 14:58:16 UTC 2010 John Goerzen <jgoerzen at complete.org> * Merge branch 'upstream' Ignore-this: 6ecb06e206da00185a182bab062fddca Fri Apr 23 14:58:16 UTC 2010 John Goerzen <jgoerzen at complete.org> * Merge branch 'upstream' Ignore-this: 6ecb06e206da00185a182bab062fddca