Merge branch 'master' into selenium
authorroot <root@debian>
Thu, 13 Oct 2011 11:01:45 +0000 (07:01 -0400)
committerroot <root@debian>
Thu, 13 Oct 2011 11:01:45 +0000 (07:01 -0400)
commitb4f9afde361bb9c413427bc4bdf1f585c777ed0f
tree3b9b2fdac39f03718e1a97834a69f57a423cfda0
parent68b7b42f6d35a8433bcaff4c1ad161e8e5f3cd06
parentaf93196e7adef53607d1e0e0938fd6043699a86a
Merge branch 'master' into selenium
component/xorg/buildout.cfg