Merge commit 'copiousfreetime/update-script-options'
commit77dfc46c3bb9f9ab635b3375c4ecaecd09b909c3
authorKeith Rarick <kr@xph.us>
Mon, 12 Oct 2009 01:07:57 +0000 (11 18:07 -0700)
committerKeith Rarick <kr@xph.us>
Mon, 12 Oct 2009 01:07:57 +0000 (11 18:07 -0700)
treee2e21d267354b5f9310e87130e3bea721181cb49
parent24aa767cf3eb0c8fb21620c621b5b4104649f41e
parentd32e949356b87a6884ab7ed1de10d6f440fd872a
Merge commit 'copiousfreetime/update-script-options'