Merge branch 'pixelgeek_windows_script_update'
authorCarlos Lopez <genetita@gmail.com>
Mon, 31 Aug 2009 16:06:35 +0000 (18:06 +0200)
committerCarlos Lopez <genetita@gmail.com>
Mon, 31 Aug 2009 16:06:35 +0000 (18:06 +0200)

Trivial merge