Merge branch 'master' into feature/gnumake4
commit18393f9d0ea5fd25a5cfdf6cea646438a0e4af14
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>
Thu, 21 Jul 2011 16:57:43 +0000 (21 18:57 +0200)
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>
Thu, 21 Jul 2011 16:57:43 +0000 (21 18:57 +0200)
treebb7a0f63271ef6b8e41ca0e382f360a07ab76d34
parentbe9748683630c0c9aba9814f0d0c90f88d55578e
parent50205b9d19efc6614fc9dcd927c0a52ebd8210ea
Merge branch 'master' into feature/gnumake4