Patches for SI v2

[Michel Dänzer]

On Die, 2013-03-26 at 11:55 +0100, Christian König wrote: 
> 
> I've found the reason why loading all constants only once makes text 
> display garbled, it was a completely unrelated bug in the ELSE pseudo op 
> handling.

Great. This new patch also fixes a previous regression I noticed in
Flightgear. Is it a candidate for the stable branch? Either way, this
patch is:

Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
Tested-by: Michel Dänzer <michel.daenzer at amd.com>


-- 
Earthling Michel Dänzer           |                   http://www.amd.com
Libre software enthusiast         |          Debian, X and DRI developer