Merge branch 'streams2'
authorisaacs <i@izs.me>
Sat, 15 Dec 2012 18:29:16 +0000 (10:29 -0800)
committerisaacs <i@izs.me>
Sat, 15 Dec 2012 18:29:16 +0000 (10:29 -0800)

Trivial merge