tree 642dc3360ee6d740f40e2ccad8201af9164ae5d2
parent ab65043663a0003c34a33210fa66e09825b6834e
parent 40333e21e65d041077a51b8df2ba3e6c9f9de9b5
author Avery Pennarun <apenwarr@gmail.com> 1343371377 -0400
committer Avery Pennarun <apenwarr@gmail.com> 1343371377 -0400

Merge remote-tracking branch 'gfiber-internal/koala3test' into HEAD

* gfiber-internal/koala3test:
  koala3test branch.

Conflicts:
	default.xml

Change-Id: I00eeb72896251279bbed771cee20fb3bdb8439a9