tree 6f1120bcc1d480e0f597b6f47e66691c5e0e040c
parent cbde9550694719e1cdaf14979977046e19fdd51f
parent f6f80705251ab1a0156768a426eeaa064064913a
author Roland Dreier <rolandd@cisco.com> 1176413783 -0700
committer Roland Dreier <rolandd@cisco.com> 1176413783 -0700

Merge branches 'stable' and 'stable-1.0' into stable