Merge branch 'devel'
commit57e015fae4e79f3916a4037bcd30e8e096727f9d
authorDan Carpenter <error27@gmail.com>
Tue, 24 Mar 2009 05:13:21 +0000 (24 08:13 +0300)
committerDan Carpenter <error27@gmail.com>
Tue, 24 Mar 2009 05:13:21 +0000 (24 08:13 +0300)
tree2dd7e270c93989c7d471843e22d0766060e3bdae
parent02c4f1b9b390e335e28951700ebf529ee3ec9c96
parent8903f3cf2361dde6940bc569f75373449fc8eb47
Merge branch 'devel'

Conflicts:
check_memory.c
check_memory.c