dpkg: fix merge
authorMartin Jansa <Martin.Jansa@gmail.com>
Mon, 12 Apr 2010 16:12:53 +0000 (18:12 +0200)
committerMartin Jansa <Martin.Jansa@gmail.com>
Mon, 12 Apr 2010 16:13:19 +0000 (18:13 +0200)
commit8195be90301213d5a9c65d511e301e611903bc2c
tree6098fb88fb7f2e6434c6ddfbdabe600f01e145ac
parente1cb7dbf89adbabd2c25a188f04d09124d6c62fa
dpkg: fix merge
recipes/dpkg/dpkg-native_1.13.22.bb
recipes/dpkg/dpkg_1.13.22.bb