Merge branch 'testing' into develv2.6.22.18-opd1
commit97e21aa78f398a7e31179f05f0a742c3f6db2fc1
authorOliver Pinter <oliver.pntr@gmail.com>
Mon, 18 Feb 2008 20:11:57 +0000 (18 21:11 +0100)
committerOliver Pinter <oliver.pntr@gmail.com>
Mon, 18 Feb 2008 20:11:57 +0000 (18 21:11 +0100)
tree60063b4193cd98dd30bac8cc8193ff1ad38f7eea
parent7cbd51235da2c7bbbb8b47aa29bfbded916f3c90
parenta228962494b69e7b3ed16f8cda693c816c68bbe7
Merge branch 'testing' into devel