merge due to non empty Repo on genivi git server. Resolving conflics in the READMEFILE
authorblacky <blacky@kiwi.(none)>
Tue, 5 Jul 2011 18:51:58 +0000 (20:51 +0200)
committerblacky <blacky@kiwi.(none)>
Tue, 5 Jul 2011 18:51:58 +0000 (20:51 +0200)
commit0108869db26775b5e30028b0956adb2007020a10
tree35d8457c83321ba0ac5ab0f14b78c7c282f943bc
parent4a32aebe3776323c176e0fe57298c1220ecc6d2c
merge due to non empty Repo on genivi git server. Resolving conflics in the READMEFILE
README