Merge branch 'vendor/GREP'
authorJohn Marino <draco@marino.st>
Tue, 26 Apr 2011 17:49:26 +0000 (19:49 +0200)
committerJohn Marino <draco@marino.st>
Tue, 26 Apr 2011 17:49:26 +0000 (19:49 +0200)

Trivial merge