From c0fe2d62abe68de74de6b8bf91635c1cdaf5d239 Mon Sep 17 00:00:00 2001
From: waspe <waspe>
Date: Mon, 03 Nov 2003 18:35:45 +0000
Subject: reolved merge conflict

---
(limited to 'noncore/settings/sysinfo/memory.cpp')

--
cgit v0.9.0.2