Merge branch 'ltpmenu2'
commitfbfab1e6e18e9eca6b2e948470c84c43606a2f58
authorJiri Palecek <jirka@debian.(none)>
Thu, 11 Jun 2009 12:53:02 +0000 (11 14:53 +0200)
committerJiri Palecek <jirka@debian.(none)>
Fri, 12 Jun 2009 09:14:13 +0000 (12 11:14 +0200)
tree491e77c609997762c28739bf4e6648a0f9b0fac6
parente889eed512c5e242376fe7e4b4fe5b9947985a17
parent41da72929338cfde06a9950c1647b5a321364b21
Merge branch 'ltpmenu2'

Conflicts:
debian/control
debian/dfsg-cleanup
debian/rules
debian/control
debian/dfsg-cleanup
debian/rules