tree 7c4a1785a18ca82ba30bca91f7e216223f29f06d
parent 9f3e3510dfa48cd86b6a4b7420b9a974ce4195fb
author pthatcher@google.com <pthatcher@google.com@dd674b97-3498-5ee5-1854-bdd07cd0ff33> 1315440954 +0000
committer pthatcher@google.com <pthatcher@google.com@dd674b97-3498-5ee5-1854-bdd07cd0ff33> 1315440954 +0000

Rebase.

git-svn-id: http://libjingle.googlecode.com/svn/trunk@79 dd674b97-3498-5ee5-1854-bdd07cd0ff33