[Bug 226022] Merge Review: libgpod