tree 1d7c32e4b69486aca3744cee5c587d5d8cb66be8
parent 32af3bcd362ec36cd988042652d0d587217b47e7
author Matthias Wessendorf <matzew@apache.org> 1265822363 +0000
committer Matthias Wessendorf <matzew@apache.org> 1265822363 +0000

Merging the following plugin chagnes to 2.x plugin branch:

TRINIDAD-1583
TRINIDAD-1677
TRINIDAD-1679