Merge branch 'cbrutail/newshader_pipelava' into cbrutail/darkzone
authorcbrutail <ruszkai.akos@gmail.com>
Wed, 4 Jan 2012 17:09:03 +0000 (18:09 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Wed, 4 Jan 2012 17:09:03 +0000 (18:09 +0100)

Trivial merge