Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9

jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/generator/FrameGenerator.java

@@ -72,6 +72,8 @@ public abstract class FrameGenerator<T extends BaseFrame>
         ByteBuffer buffer = ByteBuffer.allocate(buflen);
         // TODO: figure out how to get this from a bytebuffer pool
 
+        buffer.put(framing);
+        
         generatePayload(buffer, frame);
         return buffer;
     }