merge of '12352b7bc5ed816b041b5c82997364952c87b92b'
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 24 Jul 2006 18:01:50 +0000 (18:01 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Mon, 24 Jul 2006 18:01:50 +0000 (18:01 +0000)
commit2d8d69888259bdb65dc982dd5c4594ad91db546d
treecd593ec2d10de47f6c4705f9b3edffc0c6b2487e
parent817cb42b0dc6e3db089c8cdc4a1340718e858000
parent2496c7ff2948f46a26af3288cc838cddc4d0a9e9
Merge ... '12352b7bc5ed816b041b5c82997364952c87b92b'
     and '5dd453cc72f6d98b8b8b88d2c4198cd2f26e858e'
conf/distro/jlime-donkey.conf