Merge commit 'origin/master' into gallium-0.2

diff --cc src/mesa/main/image.c
Simple merge

diff --cc src/mesa/main/texenvprogram.c
index 237ddaa683868786f1a8185ee00332d2a6bf15a9,ba7ce4a3cc65a268a5bd91e7fc26d21fdb97f485..3cb103f51f8494b0db48954f454e0a9d8774b6d5
--- 1/src/mesa/main/texenvprogram.c
--- 2/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@@ -301,10 -218,10 +302,12 @@@ static void make_state_key( GLcontext *
        if (!texUnit->_ReallyEnabled || !texUnit->Enabled)
           continue;
  
+       format = texUnit->_Current->Image[0][texUnit->_Current->BaseLevel]->_BaseFormat;
+ 
        key->unit[i].enabled = 1;
        key->enabled_units |= (1<<i);
 +      key->nr_enabled_units = i+1;
 +      inputs_referenced |= FRAG_BIT_TEX(i);
  
        key->unit[i].source_index = 
         translate_tex_src_bit(texUnit->_ReallyEnabled);                

diff --cc src/mesa/main/texstore.c
Simple merge