Merge git://repo.or.cz/gitmagic/dustin
commita70dc1dd3ebd0ef7c6c6ec5aca48ea72cec1f874
authorBen Lynn <blynn@monkey.corp.google.com>
Sun, 13 Apr 2008 09:29:41 +0000 (13 02:29 -0700)
committerBen Lynn <blynn@monkey.corp.google.com>
Sun, 13 Apr 2008 09:29:41 +0000 (13 02:29 -0700)
tree20e8fee259b72d10ad2d102c161fad5e3d6b2d6d
parent19e7fe33048acf4214f8958342a019ced2e1d50c
parent4b7cccfaf09d3fff50e702a820f3830206b153c0
Merge git://repo.or.cz/gitmagic/dustin