Merge branch 'glsl-pp-rework-2'
authorMichal Krol <michal@vmware.com>
Thu, 17 Dec 2009 16:00:46 +0000 (17:00 +0100)
committerMichal Krol <michal@vmware.com>
Thu, 17 Dec 2009 16:00:46 +0000 (17:00 +0100)

Trivial merge