tree e7f61f821d549fd73f1b535ba65d6860bd674993
parent 40f5a4ea3bc90e43a442ab336f2342020bba86b3
parent 843ef36f7b96cc19ea7d2996b7c8661b41ec3452
author Jean-Baptiste Queru <jbq@google.com> 1242844091 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1242844091 -0700

reconcile donut snapshot

Merge branch 'donut-snapshot' into HEAD