Merge commit 'origin/master' into glsl-pp-rework-2
authorMichal Krol <michal@vmware.com>
Mon, 14 Sep 2009 09:22:05 +0000 (11:22 +0200)
committerMichal Krol <michal@vmware.com>
Mon, 14 Sep 2009 09:22:05 +0000 (11:22 +0200)

Trivial merge