tree 5ce744f172ab93681557e99deebaa48dd03abca1
parent 314a5bd612990b480715a81fbd2f0ac3bd6b00dd
parent 54685f3fb85bc77163cb51bdc0ec61538792965a
author Avery Pennarun <apenwarr@gmail.com> 1345883718 -0400
committer Avery Pennarun <apenwarr@gmail.com> 1345883718 -0400

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

* gfiber-internal/nightingale:
  .

Conflicts:
	default.xml

Change-Id: Iada6cfb20fac1ca628471a79a777e125cbcfc64c