Merge branch 'patch'

diff --combined src/SDL.xs
index b72fbba,1ab9d49..9db342c
--- 1/src/SDL.xs
--- 2/src/SDL.xs
+++ b/src/SDL.xs
@@@ -1208,6 -1208,20 +1208,20 @@@ ColorB ( color, ... 
                RETVAL
  
  void
+ ColorRGB ( color, ... )
+       SDL_Color *color
+       PPCODE:
+               if (items > 1 ) {
+                       color->r = SvIV(ST(1)); 
+                       color->g = SvIV(ST(2)); 
+                       color->b = SvIV(ST(3)); 
+               }
+               mXPUSHi( color->r );
+               mXPUSHi( color->g );
+               mXPUSHi( color->b );
+               XSRETURN(3);
+ 
+ void
  FreeColor ( color )
        SDL_Color *color
        CODE:
@@@ -2323,7 -2337,7 +2337,7 @@@ JoyAxisEventValue ( e 
          OUTPUT:
                  RETVAL
  
 -Uint8
 +Sint16
  JoyButtonEventWhich ( e )
          SDL_Event *e
          CODE: