Merge branch 'wolfc-exp-3.1'
authorCarlo de Wolf <cdewolf@redhat.com>
Mon, 1 Mar 2010 14:09:04 +0000 (15:09 +0100)
committerCarlo de Wolf <cdewolf@redhat.com>
Mon, 1 Mar 2010 14:09:04 +0000 (15:09 +0100)
commit7c5a0c145c5a5ddcc4d7d5aa48883230032a5e92
tree1dc7e95bbb8b11b3d168186245aaf953bdac2c64
parent402a4cfe243046351b4a92749e6bb72d38d0fb20
parent6dada02b1a1ca289302d3696f72feabcee6522c1
Merge branch 'wolfc-exp-3.1'

Conflicts:
base/pom.xml
base/pom.xml