A few trivial changes were needed to adapt to upstream framework changes. Signed-off-by: Daniel Golle <daniel@makrotopia.org> SVN-Revision: 43499