Merge remote branch 'origin/master' 0.6
authorKeith Packard <keithp@keithp.com>
Mon, 2 Nov 2009 23:47:40 +0000 (15:47 -0800)
committerKeith Packard <keithp@keithp.com>
Mon, 2 Nov 2009 23:47:40 +0000 (15:47 -0800)
commit7db9d86178ecfd58cc1c17ac9fcbdcfd2f13aaec
tree69455f2c25758c247a2455cc7ff45d5bb5fee9cd
parentb219801fb0e5eaff7778d21701da977104522da3
parentf9de20000794c97a04d5bc2476191864bd2af371
Merge remote branch 'origin/master'