Merge branch 'custom-vars'
authorRobert Manea <gotmor@gmail.com>
Sat, 25 Jul 2009 09:33:54 +0000 (11:33 +0200)
committerRobert Manea <gotmor@gmail.com>
Sat, 25 Jul 2009 09:33:54 +0000 (11:33 +0200)

Trivial merge